From 76bacd662675e7ca0d7c894887974e0edb693dcd Mon Sep 17 00:00:00 2001 From: Sergey Patrikeev Date: Fri, 27 Dec 2019 16:37:40 +0300 Subject: [PATCH] Generify FileBasedIndexExtension.EP_NAME GitOrigin-RevId: 6d8365ba146d9438c8f12b74376244aebfbe238d --- .../com/intellij/util/indexing/FileBasedIndexExtension.java | 2 +- .../src/com/intellij/util/indexing/FileBasedIndexImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java index 8e5c2dbde00c..ae532be17598 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java @@ -21,7 +21,7 @@ import java.util.Collections; @ApiStatus.OverrideOnly public abstract class FileBasedIndexExtension extends IndexExtension { - public static final ExtensionPointName EXTENSION_POINT_NAME = + public static final ExtensionPointName> EXTENSION_POINT_NAME = ExtensionPointName.create("com.intellij.fileBasedIndex"); private static final int DEFAULT_CACHE_SIZE = 1024; 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 b667d9ccb44c..b67eca401335 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java @@ -2484,9 +2484,9 @@ public final class FileBasedIndexImpl extends FileBasedIndex { private void initAssociatedDataForExtensions() { Activity activity = StartUpMeasurer.startActivity("file index extensions iteration"); - Iterator extensions = + Iterator> extensions = IndexInfrastructure.hasIndices() ? - ((ExtensionPointImpl)FileBasedIndexExtension.EXTENSION_POINT_NAME.getPoint(null)).iterator() : + ((ExtensionPointImpl>)FileBasedIndexExtension.EXTENSION_POINT_NAME.getPoint(null)).iterator() : Collections.emptyIterator(); // todo: init contentless indices first ?