From dfe03c84b62c2c2412ca3d5caf7ef8238e33d1db Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 21 May 2019 16:36:14 +0300 Subject: [PATCH] make all indices psi dependent by default (fix grammatical review marks from IDEA-CR-47345) GitOrigin-RevId: 0c6168ece602bc809deb8262d5d9a3dec55e5cc0 --- ...sDependentIndex.java => DocumentChangeDependentIndex.java} | 4 ++-- .../src/com/intellij/util/indexing/PsiDependentIndex.java | 2 +- .../src/com/intellij/psi/impl/cache/impl/id/IdIndex.java | 2 +- .../lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java | 2 +- .../src/com/intellij/util/indexing/FileBasedIndexImpl.java | 2 +- .../plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java | 2 +- .../org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java | 2 +- .../org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename platform/indexing-api/src/com/intellij/util/indexing/{DocumentChangesDependentIndex.java => DocumentChangeDependentIndex.java} (64%) diff --git a/platform/indexing-api/src/com/intellij/util/indexing/DocumentChangesDependentIndex.java b/platform/indexing-api/src/com/intellij/util/indexing/DocumentChangeDependentIndex.java similarity index 64% rename from platform/indexing-api/src/com/intellij/util/indexing/DocumentChangesDependentIndex.java rename to platform/indexing-api/src/com/intellij/util/indexing/DocumentChangeDependentIndex.java index 39178f7c17ba..3bd57ed1224f 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/DocumentChangesDependentIndex.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/DocumentChangeDependentIndex.java @@ -6,9 +6,9 @@ import org.jetbrains.annotations.ApiStatus; /** * Marker interface of index that use document changes to update it's data. These indices shouldn't depend on PSI-related stuff. * - * Note, every {@link FileBasedIndexExtension} with {@link FileBasedIndexExtension#dependsOnFileContent()} returns false is treated as document changes dependent. + * Note, every {@link FileBasedIndexExtension} where {@link FileBasedIndexExtension#dependsOnFileContent()} returns false is treated as document change dependent. */ @ApiStatus.Experimental -public interface DocumentChangesDependentIndex { +public interface DocumentChangeDependentIndex { } diff --git a/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java b/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java index 53ea2132d9b5..7030b593f9d6 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java @@ -18,7 +18,7 @@ package com.intellij.util.indexing; /** * Marker interface of index that is built from PSI, meaning its invalidation will happen upon producing new PSI. * - * @deprecated by default all content-aware indices are psi dependent. Use {@link DocumentChangesDependentIndex} to make index psi-independent. + * @deprecated by default all content-aware indices are psi dependent. Use {@link DocumentChangeDependentIndex} to make index psi-independent. */ @Deprecated public interface PsiDependentIndex { diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java index 67f4c8198976..7300076050ef 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java @@ -43,7 +43,7 @@ import java.util.Map; /** * @author Eugene Zhuravlev */ -public class IdIndex extends FileBasedIndexExtension implements DocumentChangesDependentIndex { +public class IdIndex extends FileBasedIndexExtension implements DocumentChangeDependentIndex { @NonNls public static final ID NAME = ID.create("IdIndex"); private final FileBasedIndex.InputFilter myInputFilter = file -> isIndexable(file.getFileType()); diff --git a/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java b/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java index ccfe649f5596..b36851a935b5 100644 --- a/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java +++ b/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java @@ -41,7 +41,7 @@ import java.util.Collection; import java.util.Map; public class TrigramIndex extends ScalarIndexExtension implements CustomInputsIndexFileBasedIndexExtension, - DocumentChangesDependentIndex { + DocumentChangeDependentIndex { public static final boolean ENABLED = SystemProperties.getBooleanProperty("idea.internal.trigramindex.enabled", true); public static final ID INDEX_ID = ID.create("Trigram.Index"); diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java index c37b705567a9..966df165afaa 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java @@ -2532,7 +2532,7 @@ public final class FileBasedIndexImpl extends FileBasedIndex implements Disposab if (INDICES_ARE_PSI_DEPENDENT_BY_DEFAULT) { return extension instanceof FileBasedIndexExtension && ((FileBasedIndexExtension)extension).dependsOnFileContent() && - !(extension instanceof DocumentChangesDependentIndex); + !(extension instanceof DocumentChangeDependentIndex); } else { return extension instanceof PsiDependentIndex; } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java index 07ef39f11a0c..885e42a95354 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -public class JavaFxCustomComponentsIndex extends FileBasedIndexExtension> implements DocumentChangesDependentIndex { +public class JavaFxCustomComponentsIndex extends FileBasedIndexExtension> implements DocumentChangeDependentIndex { @NonNls public static final ID> KEY = ID.create("javafx.custom.component"); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java index c54a427ae478..c43cfc0c2511 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import java.util.*; -public class JavaFxIdsIndex extends FileBasedIndexExtension> implements DocumentChangesDependentIndex { +public class JavaFxIdsIndex extends FileBasedIndexExtension> implements DocumentChangeDependentIndex { @NonNls public static final ID> KEY = ID.create("javafx.id.name"); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java index 22c9dad23b87..e8f975dfecc7 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java @@ -39,7 +39,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -public class XsltSymbolIndex extends FileBasedIndexExtension implements DocumentChangesDependentIndex { +public class XsltSymbolIndex extends FileBasedIndexExtension implements DocumentChangeDependentIndex { @NonNls public static final ID NAME = ID.create("XsltSymbolIndex");