reduce direct usage count of IndexingDataKeys.PROJECT

GitOrigin-RevId: ab7e8d6627f085402ca8224e5dcbc184cddd31e8

java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaBinaryPlusExpressionIndexTest.kt

@@ -26,8 +26,7 @@ class JavaBinaryPlusExpressionIndexTest : BasePlatformTestCase() {
                 }
             }
     """).virtualFile
-    val content = FileContentImpl.createByFile(file)
+    val content = FileContentImpl.createByFile(file, project)
-    content.putUserData(IndexingDataKeys.PROJECT, project)
     val data = JavaBinaryPlusExpressionIndex().indexer.map(content).entries.first().value.offsets!!
 
     assertEquals(5, data.size)

java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaNullMethodArgumentIndexTest.kt

@@ -87,8 +87,7 @@ class JavaNullMethodArgumentIndexTest : BasePlatformTestCase() {
                 }
             }
     """).virtualFile
-    val content = FileContentImpl.createByFile(file)
+    val content = FileContentImpl.createByFile(file, project)
-    content.putUserData(IndexingDataKeys.PROJECT, project)
     val data = JavaNullMethodArgumentIndex().indexer.map(content).keys
 
     assertSize(8, data)

java/java-tests/testSrc/com/intellij/util/JavaPropertyDetectionTest.kt

@@ -181,8 +181,7 @@ class JavaPropertyDetectionTest : LightJavaCodeInsightFixtureTestCase() {
 
   private fun assertJavaSimplePropertyIndex(text: String, expected: TIntObjectHashMap<PropertyIndexValue>) {
     val file = myFixture.configureByText(JavaFileType.INSTANCE, text)
-    val content = FileContentImpl.createByFile(file.virtualFile)
+    val content = FileContentImpl.createByFile(file.virtualFile, project)
-    content.putUserData(IndexingDataKeys.PROJECT, project)
     val data = JavaSimplePropertyIndex().indexer.map(content).values.firstOrNull() ?: TIntObjectHashMap()
     assertEquals(expected, data)
   }

json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaFileValuesIndexTest.java

@@ -19,45 +19,46 @@ import com.intellij.json.JsonTestCase;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.indexing.FileContentImpl;
 
+import java.io.IOException;
 import java.util.Map;
 
 import static com.jetbrains.jsonSchema.impl.JsonCachedValues.*;
 
 public class JsonSchemaFileValuesIndexTest extends JsonTestCase {
 
-  public void testEmpty() {
+  public void testEmpty() throws IOException {
     final VirtualFile file = myFixture.configureByFile("indexing/empty.json").getVirtualFile();
     Map<String, String> map = new JsonSchemaFileValuesIndex().getIndexer().map(FileContentImpl.createByFile(file));
     assertAllCacheNulls(map);
   }
 
-  public void testSimple() {
+  public void testSimple() throws IOException {
     final VirtualFile file = myFixture.configureByFile("indexing/empty.json").getVirtualFile();
     Map<String, String> map = new JsonSchemaFileValuesIndex().getIndexer().map(FileContentImpl.createByFile(file));
     assertAllCacheNulls(map);
   }
 
-  public void testValid() {
+  public void testValid() throws IOException {
     final VirtualFile file = myFixture.configureByFile("indexing/valid.json").getVirtualFile();
     Map<String, String> map = new JsonSchemaFileValuesIndex().getIndexer().map(FileContentImpl.createByFile(file));
     assertEquals("the-id", map.get(ID_CACHE_KEY));
     assertCacheNull(map.get(URL_CACHE_KEY));
   }
 
-  public void testValid2() {
+  public void testValid2() throws IOException {
     final VirtualFile file = myFixture.configureByFile("indexing/valid2.json5").getVirtualFile();
     Map<String, String> map = new JsonSchemaFileValuesIndex().getIndexer().map(FileContentImpl.createByFile(file));
     assertEquals("the-schema", map.get(URL_CACHE_KEY));
     assertCacheNull(map.get(ID_CACHE_KEY));
   }
 
-  public void testInvalid() {
+  public void testInvalid() throws IOException {
     final VirtualFile file = myFixture.configureByFile("indexing/invalid.json").getVirtualFile();
     Map<String, String> map = new JsonSchemaFileValuesIndex().getIndexer().map(FileContentImpl.createByFile(file));
     assertAllCacheNulls(map);
   }
 
-  public void testStopsOnAllFound() {
+  public void testStopsOnAllFound() throws IOException {
     final VirtualFile file = myFixture.configureByFile("indexing/duplicates.json5").getVirtualFile();
     Map<String, String> map = new JsonSchemaFileValuesIndex().getIndexer().map(FileContentImpl.createByFile(file));
     assertEquals("the-schema", map.get(URL_CACHE_KEY));

platform/core-impl/src/com/intellij/psi/stubs/CoreStubTreeLoader.java

@@ -44,8 +44,7 @@ public class CoreStubTreeLoader extends StubTreeLoader {
     }
 
     try {
-      final FileContent fc = new FileContentImpl(vFile, vFile.contentsToByteArray());
+      final FileContent fc = FileContentImpl.createByFile(vFile, project);
-      fc.putUserData(IndexingDataKeys.PROJECT, project);
       final Stub element = StubTreeBuilder.buildStubTree(fc);
       if (element instanceof PsiFileStub) {
         return new StubTree((PsiFileStub)element);

platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java

@@ -137,14 +137,16 @@ public class FileContentImpl extends IndexedFileImpl implements PsiDependentFile
     }
   }
 
-  @TestOnly
+  public static FileContent createByFile(@NotNull VirtualFile file) throws IOException {
-  public static FileContent createByFile(@NotNull VirtualFile file) {
+    return createByFile(file, null);
-    try {
+  }
-      return new FileContentImpl(file, file.contentsToByteArray());
+
-    }
+  public static FileContent createByFile(@NotNull VirtualFile file, @Nullable Project project) throws IOException {
-    catch (IOException e) {
+    FileContentImpl content = new FileContentImpl(file, file.contentsToByteArray());
-      throw new RuntimeException(e);
+    if (project != null) {
+      content.putUserData(IndexingDataKeys.PROJECT, project);
     }
+    return content;
   }
 
   @NotNull

platform/lang-impl/src/com/intellij/internal/psiView/stubtree/StubViewerPsiBasedTree.java

@@ -174,8 +174,7 @@ public class StubViewerPsiBasedTree implements ViewerPsiBasedTree {
       LightVirtualFile file = new LightVirtualFile("stub", rootElement.getLanguage(), textToParse);
       final FileContentImpl fc;
       try {
-        fc = new FileContentImpl(file, file.contentsToByteArray());
+        fc = (FileContentImpl)FileContentImpl.createByFile(file, project);
-        fc.putUserData(IndexingDataKeys.PROJECT, project);
         fc.putUserData(IndexingDataKeys.PSI_FILE, psiFile);
         stub = StubTreeBuilder.buildStubTree(fc);
       }

platform/lang-impl/src/com/intellij/util/indexing/hash/HashBasedIndexGenerator.java

@@ -138,8 +138,7 @@ public class HashBasedIndexGenerator<K, V> {
     }
     myIndexedFilesNumber.incrementAndGet();
     try {
-      FileContentImpl fc = new FileContentImpl(f, f.contentsToByteArray());
+      FileContentImpl fc = (FileContentImpl)FileContentImpl.createByFile(f, project);
-      fc.putUserData(IndexingDataKeys.PROJECT, project);
       byte[] hash = IndexedHashesSupport.getOrInitIndexedHash(fc, false);
       int hashId = Math.abs(hashEnumerator.enumerate(hash));
       if (!myIndex.update(hashId, fc).compute()) {

plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesIndexTest.java

@@ -26,6 +26,7 @@ import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.indexing.FileContentImpl;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +36,7 @@ import java.util.Map;
  */
 public class XmlPropertiesIndexTest extends BasePlatformTestCase {
 
-  public void testIndex() {
+  public void testIndex() throws IOException {
     PsiFile psiFile = myFixture.configureByFile("foo.xml");
     final VirtualFile file = psiFile.getVirtualFile();
     Map<XmlPropertiesIndex.Key, String> map = new XmlPropertiesIndex().map(FileContentImpl.createByFile(file));
@@ -58,7 +59,7 @@ public class XmlPropertiesIndexTest extends BasePlatformTestCase {
     assertEquals("bar", assertOneElement(values));
   }
 
-  public void testSystemId() {
+  public void testSystemId() throws IOException {
     PsiFile psiFile = myFixture.configureByFile("wrong.xml");
     final VirtualFile file = psiFile.getVirtualFile();
     Map<XmlPropertiesIndex.Key, String> map = new XmlPropertiesIndex().map(FileContentImpl.createByFile(file));