MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

a bit cheaper StubHierarchyIndex clinit

Browse Source
This commit is contained in:
peter
2018-12-12 11:18:48 +01:00
parent 7b1f29c5b9
commit ebb7d198a9
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyServiceImpl.java
+6 -2
View File
@@ -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();
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java
+5 -10
View File
@@ -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);
}