diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
index 73bbbfc6b2c9..f6c832841da5 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
@@ -19,7 +19,7 @@ import com.intellij.lexer.Lexer;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.impl.cache.impl.id.IdIndexEntry;
 import com.intellij.psi.impl.cache.impl.id.IdTableBuilding;
-import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer;
+import com.intellij.psi.impl.cache.impl.id.LexingIdIndexer;
 import com.intellij.psi.impl.cache.impl.todo.TodoIndexEntry;
 import com.intellij.psi.search.IndexPattern;
 import com.intellij.util.indexing.FileContent;
@@ -40,7 +40,7 @@ public class BaseFilterLexerUtil {
     }
 
     final boolean needTodo = content.getFile().isInLocalFileSystem(); // same as TodoIndex.getFilter().isAcceptable
-    final boolean needIdIndex = IdTableBuilding.getFileTypeIndexer(content.getFileType()) instanceof LexerBasedIdIndexer;
+    final boolean needIdIndex = IdTableBuilding.getFileTypeIndexer(content.getFileType()) instanceof LexingIdIndexer;
 
     final IdDataConsumer consumer = needIdIndex? new IdDataConsumer():null;
     final OccurrenceConsumer todoOccurrenceConsumer = new OccurrenceConsumer(consumer, needTodo);
diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexerBasedIdIndexer.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexerBasedIdIndexer.java
index 4441071040e4..cddedc326654 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexerBasedIdIndexer.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexerBasedIdIndexer.java
@@ -27,8 +27,7 @@ import java.util.Map;
  * @author Eugene Zhuravlev
  *         Date: Jan 20, 2008
  */
-public abstract class LexerBasedIdIndexer extends FileTypeIdIndexer implements IdAndToDoScannerBasedOnFilterLexer {
-  
+public abstract class LexerBasedIdIndexer implements LexingIdIndexer, IdAndToDoScannerBasedOnFilterLexer {
   @Override
   @NotNull
   public final Map<IdIndexEntry,Integer> map(@NotNull final FileContent inputData) {
diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexingIdIndexer.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexingIdIndexer.java
new file mode 100644
index 000000000000..5b316d14da0f
--- /dev/null
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexingIdIndexer.java
@@ -0,0 +1,10 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.psi.impl.cache.impl.id;
+
+/**
+ * @author traff
+ * <p>
+ * Marker interface that defines lexer that performes lexing to get Id index map
+ */
+public interface LexingIdIndexer extends IdIndexer {
+}
diff --git a/platform/lang-impl/src/com/intellij/index/PrebuiltIndexAwareIdIndexer.kt b/platform/lang-impl/src/com/intellij/index/PrebuiltIndexAwareIdIndexer.kt
index 03ec09b68300..e469819a3c00 100644
--- a/platform/lang-impl/src/com/intellij/index/PrebuiltIndexAwareIdIndexer.kt
+++ b/platform/lang-impl/src/com/intellij/index/PrebuiltIndexAwareIdIndexer.kt
@@ -3,7 +3,7 @@ package com.intellij.index
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.psi.impl.cache.impl.id.IdIndexEntry
-import com.intellij.psi.impl.cache.impl.id.IdIndexer
+import com.intellij.psi.impl.cache.impl.id.LexingIdIndexer
 import com.intellij.util.indexing.FileContent
 import com.intellij.util.indexing.impl.DebugAssertions
 import com.intellij.util.io.DataExternalizer
@@ -15,7 +15,7 @@ import java.io.DataOutput
  * @author traff
  */
 
-abstract class PrebuiltIndexAwareIdIndexer : PrebuiltIndexProviderBase<Map<IdIndexEntry, Int>>(), IdIndexer {
+abstract class PrebuiltIndexAwareIdIndexer : PrebuiltIndexProviderBase<Map<IdIndexEntry, Int>>(), LexingIdIndexer {
   companion object {
     private val LOG = Logger.getInstance("#com.intellij.index.PrebuiltIndexAwareIdIndexer")
     val ID_INDEX_FILE_NAME = "id-index"