From 9a4399f44b169048eabc34b3b5a29930f06528c8 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Fri, 5 Jul 2019 12:46:31 +0300 Subject: [PATCH] remove usages of PsiDependentIndex GitOrigin-RevId: 22be85b5dfd4fbe5ca008ab42c68a9db25cae95f --- .../src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt | 2 +- .../intellij/psi/impl/java/JavaBinaryPlusExpressionIndex.java | 2 +- .../intellij/psi/impl/java/JavaFunctionalExpressionIndex.java | 2 +- .../intellij/psi/impl/search/JavaNullMethodArgumentIndex.java | 2 +- .../src/com/intellij/dupLocator/index/DuplicatesIndex.java | 2 +- .../src/com/intellij/psi/stubs/StubUpdatingIndex.java | 3 +-- .../src/dom/index/IdeaPluginRegistrationIndex.java | 4 +--- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt b/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt index e6155537989d..5fb4f24ac2e6 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt @@ -61,7 +61,7 @@ private fun resolveFieldFromIndexValue(method: PsiMethodImpl, isGetter: Boolean) data class PropertyIndexValue(val propertyRefText: String, val getter: Boolean) -class JavaSimplePropertyIndex : FileBasedIndexExtension(), PsiDependentIndex { +class JavaSimplePropertyIndex : FileBasedIndexExtension() { private val allowedExpressions by lazy { TokenSet.create(ElementType.REFERENCE_EXPRESSION, ElementType.THIS_EXPRESSION, ElementType.SUPER_EXPRESSION) } diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaBinaryPlusExpressionIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaBinaryPlusExpressionIndex.java index fec920694c04..4e6d16449656 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaBinaryPlusExpressionIndex.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaBinaryPlusExpressionIndex.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -public class JavaBinaryPlusExpressionIndex extends FileBasedIndexExtension implements PsiDependentIndex { +public class JavaBinaryPlusExpressionIndex extends FileBasedIndexExtension { public static final ID INDEX_ID = ID.create("java.binary.plus.expression"); @NotNull diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaFunctionalExpressionIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaFunctionalExpressionIndex.java index 64fe56de4e33..0db3f18567f3 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaFunctionalExpressionIndex.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaFunctionalExpressionIndex.java @@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static com.intellij.psi.impl.source.tree.JavaElementType.*; -public class JavaFunctionalExpressionIndex extends FileBasedIndexExtension> implements PsiDependentIndex { +public class JavaFunctionalExpressionIndex extends FileBasedIndexExtension> { public static final ID> INDEX_ID = ID.create("java.fun.expression"); private static final KeyDescriptor KEY_DESCRIPTOR = new KeyDescriptor() { @Override diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentIndex.java index a56c0d769160..c512610b4ace 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentIndex.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentIndex.java @@ -35,7 +35,7 @@ import java.util.*; import static com.intellij.psi.impl.source.tree.JavaElementType.*; -public class JavaNullMethodArgumentIndex extends ScalarIndexExtension implements PsiDependentIndex { +public class JavaNullMethodArgumentIndex extends ScalarIndexExtension { private static final Logger LOG = Logger.getInstance(JavaNullMethodArgumentIndex.class); public static final ID INDEX_ID = ID.create("java.null.method.argument"); diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java index 277480a34498..7340e1dc8e71 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java @@ -48,7 +48,7 @@ import java.util.Map; /** * @author Maxim.Mossienko on 12/11/13. */ -public class DuplicatesIndex extends FileBasedIndexExtension implements PsiDependentIndex { +public class DuplicatesIndex extends FileBasedIndexExtension { static boolean ourEnabled = SystemProperties.getBooleanProperty("idea.enable.duplicates.online.calculation", true); static final boolean ourEnabledLightProfiles = true; diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java index 98c27f78895a..d93b94a986e2 100644 --- a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java @@ -45,8 +45,7 @@ import java.io.*; import java.util.*; public class StubUpdatingIndex extends SingleEntryFileBasedIndexExtension - implements PsiDependentIndex, - CustomImplementationFileBasedIndexExtension { + implements CustomImplementationFileBasedIndexExtension { static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.StubUpdatingIndex"); private static final int VERSION = 39 + (PersistentHashMapValueStorage.COMPRESSION_ENABLED ? 1 : 0); diff --git a/plugins/devkit/devkit-core/src/dom/index/IdeaPluginRegistrationIndex.java b/plugins/devkit/devkit-core/src/dom/index/IdeaPluginRegistrationIndex.java index 34d13e659235..2a2cbfc3468b 100644 --- a/plugins/devkit/devkit-core/src/dom/index/IdeaPluginRegistrationIndex.java +++ b/plugins/devkit/devkit-core/src/dom/index/IdeaPluginRegistrationIndex.java @@ -34,9 +34,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; -public class IdeaPluginRegistrationIndex - extends FileBasedIndexExtension> - implements PsiDependentIndex { +public class IdeaPluginRegistrationIndex extends FileBasedIndexExtension> { private static final int INDEX_VERSION = 1;