From ebb7d198a987b97e4b09083f1ac4adec8c4348c8 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 12 Dec 2018 11:10:30 +0100
Subject: [PATCH] a bit cheaper StubHierarchyIndex clinit

---
 .../stubsHierarchy/impl/HierarchyServiceImpl.java |  8 ++++++--
 .../stubsHierarchy/impl/StubHierarchyIndex.java   | 15 +++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyServiceImpl.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyServiceImpl.java
index d0d171d7fd2a..a684e3809c4a 100644
--- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyServiceImpl.java
+++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyServiceImpl.java
@@ -34,9 +34,13 @@ import com.intellij.util.indexing.FileBasedIndexImpl;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.BitSet;
+import java.util.stream.IntStream;
 
 public class HierarchyServiceImpl extends HierarchyService {
   private static final SingleClassHierarchy EMPTY_HIERARCHY = new SingleClassHierarchy(Symbol.ClassSymbol.EMPTY_ARRAY, new AnchorRepository());
+  private static final int KEY_COUNT = 20;
+  static final int[] SOURCE_KEYS = IntStream.rangeClosed(-KEY_COUNT, -1).toArray();
+  static final int[] BINARY_KEYS = IntStream.rangeClosed(1, KEY_COUNT).toArray();
   private final Project myProject;
   private final CachedValue<SingleClassHierarchy> myHierarchy;
 
@@ -69,10 +73,10 @@ public class HierarchyServiceImpl extends HierarchyService {
     StubEnter stubEnter = new StubEnter(symbols);
     IdSets idSets = IdSets.getIdSets(myProject);
 
-    loadUnits(idSets.libraryFiles, StubHierarchyIndex.BINARY_KEYS, stubEnter);
+    loadUnits(idSets.libraryFiles, BINARY_KEYS, stubEnter);
     stubEnter.connect1();
 
-    loadUnits(idSets.sourceFiles, StubHierarchyIndex.SOURCE_KEYS, stubEnter);
+    loadUnits(idSets.sourceFiles, SOURCE_KEYS, stubEnter);
     stubEnter.connect2();
 
     return symbols.createHierarchy();
diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java
index e6019223e13b..dcdca7280a66 100644
--- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java
+++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java
@@ -32,19 +32,13 @@ import org.jetbrains.annotations.NotNull;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.stream.IntStream;
 
 /**
  * @author peter
  */
 public class StubHierarchyIndex extends FileBasedIndexExtension<Integer, SerializedUnit> implements PsiDependentIndex {
-  private static final int KEY_COUNT = 20;
-  static final int[] BINARY_KEYS = IntStream.rangeClosed(1, KEY_COUNT).toArray();
-  static final int[] SOURCE_KEYS = IntStream.rangeClosed(-KEY_COUNT, -1).toArray();
   static final ID<Integer, SerializedUnit> INDEX_ID = ID.create("jvm.hierarchy");
-  private static final StubHierarchyIndexer[] ourIndexers = StubHierarchyIndexer.EP_NAME.getExtensions();
 
   @NotNull
   @Override
@@ -56,11 +50,11 @@ public class StubHierarchyIndex extends FileBasedIndexExtension<Integer, Seriali
   @Override
   public DataIndexer<Integer, SerializedUnit, FileContent> getIndexer() {
     return inputData -> {
-      for (StubHierarchyIndexer indexer : ourIndexers) {
+      for (StubHierarchyIndexer indexer : StubHierarchyIndexer.EP_NAME.getExtensionList()) {
         VirtualFile file = inputData.getFile();
         IndexTree.Unit unit = indexer.handlesFile(file) ? indexer.indexFile(inputData) : null;
         if (unit != null && unit.myDecls.length > 0) {
-          int[] keys = file.getFileType().isBinary() ? BINARY_KEYS : SOURCE_KEYS;
+          int[] keys = file.getFileType().isBinary() ? HierarchyServiceImpl.BINARY_KEYS : HierarchyServiceImpl.SOURCE_KEYS;
           return Collections.singletonMap(keys[((VirtualFileWithId) file).getId() % keys.length], new SerializedUnit(unit));
         }
       }
@@ -96,14 +90,15 @@ public class StubHierarchyIndex extends FileBasedIndexExtension<Integer, Seriali
 
   @Override
   public int getVersion() {
-    return IndexTree.STUB_HIERARCHY_ENABLED ? 8 + Arrays.stream(ourIndexers).mapToInt(StubHierarchyIndexer::getVersion).sum() : 0;
+    return IndexTree.STUB_HIERARCHY_ENABLED ? 8 + StubHierarchyIndexer.EP_NAME.extensions().mapToInt(StubHierarchyIndexer::getVersion).sum()
+                                            : 0;
   }
 
   @NotNull
   @Override
   public FileBasedIndex.InputFilter getInputFilter() {
     return file -> IndexTree.STUB_HIERARCHY_ENABLED &&
-                   Arrays.stream(ourIndexers).anyMatch(indexer -> indexer.handlesFile(file)) &&
+                   StubHierarchyIndexer.EP_NAME.extensions().anyMatch(indexer -> indexer.handlesFile(file)) &&
                    isSourceOrLibrary(file);
   }