inline FileBasedIndex#ourEnableTracingOfKeyHashToVirtualFileMapping

This commit is contained in:
Gregory.Shrago
2019-04-16 14:25:17 +03:00
parent 1d4eeb0fe4
commit 6e9c41dfed
12 changed files with 35 additions and 54 deletions

View File

@@ -31,7 +31,7 @@ public class JavaAutoModuleNameIndex extends ScalarIndexExtension<String> {
@Override
public int getVersion() {
return 2 + (FileBasedIndex.ourEnableTracingOfKeyHashToVirtualFileMapping ? 2 : 0);
return 4;
}
@NotNull

View File

@@ -11,7 +11,6 @@ import com.intellij.psi.stubs.StringStubIndexExtension;
import com.intellij.psi.stubs.StubIndex;
import com.intellij.psi.stubs.StubIndexKey;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.indexing.FileBasedIndex;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -35,7 +34,7 @@ public class JavaModuleNameIndex extends StringStubIndexExtension<PsiJavaModule>
@Override
public int getVersion() {
return super.getVersion() + (FileBasedIndex.ourEnableTracingOfKeyHashToVirtualFileMapping ? 2 : 0);
return super.getVersion() + 2;
}
@NotNull
@@ -80,7 +79,7 @@ public class JavaModuleNameIndex extends StringStubIndexExtension<PsiJavaModule>
@Override
public boolean traceKeyHashToVirtualFileMapping() {
return FileBasedIndex.ourEnableTracingOfKeyHashToVirtualFileMapping;
return true;
}
public static @Nullable VirtualFile descriptorFile(@NotNull VirtualFile root) {

View File

@@ -22,7 +22,6 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.stubs.StringStubIndexExtension;
import com.intellij.psi.stubs.StubIndex;
import com.intellij.psi.stubs.StubIndexKey;
import com.intellij.util.indexing.FileBasedIndex;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
@@ -39,7 +38,7 @@ public class JavaShortClassNameIndex extends StringStubIndexExtension<PsiClass>
@Override
public int getVersion() {
return super.getVersion() + (FileBasedIndex.ourEnableTracingOfKeyHashToVirtualFileMapping ? 2 : 0);
return super.getVersion() + 2;
}
@NotNull
@@ -55,6 +54,6 @@ public class JavaShortClassNameIndex extends StringStubIndexExtension<PsiClass>
@Override
public boolean traceKeyHashToVirtualFileMapping() {
return FileBasedIndex.ourEnableTracingOfKeyHashToVirtualFileMapping;
return true;
}
}