From 5f523019fa6a456dceafd8a214945e7ec94510b4 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Wed, 18 Dec 2019 10:11:07 +0300 Subject: [PATCH] do not evaluate file types in id index version if composite indexer is enabled GitOrigin-RevId: cb1b04b25deeb8f2965b9acb1e784c5f82375fb6 --- .../src/com/intellij/psi/impl/cache/impl/id/IdIndexImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndexImpl.java index 2066acf95eaa..3f05a84f4d24 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndexImpl.java @@ -15,12 +15,11 @@ import java.util.Collection; public class IdIndexImpl extends IdIndex implements CustomInputsIndexFileBasedIndexExtension { @Override public int getVersion() { - FileType[] types = FileTypeRegistry.getInstance().getRegisteredFileTypes(); - Arrays.sort(types, (o1, o2) -> Comparing.compare(o1.getName(), o2.getName())); - int version = super.getVersion(); if (!InvertedIndex.ARE_COMPOSITE_INDEXERS_ENABLED) { + FileType[] types = FileTypeRegistry.getInstance().getRegisteredFileTypes(); + Arrays.sort(types, (o1, o2) -> Comparing.compare(o1.getName(), o2.getName())); for(FileType fileType:types) { if (!isIndexable(fileType)) continue; IdIndexer indexer = IdTableBuilding.getFileTypeIndexer(fileType);