diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java
rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexer.java
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
similarity index 94%
rename from platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
index 7ac97fa442fa..43f6ce4aec93 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/BaseFilterLexerUtil.java
@@ -17,7 +17,7 @@ package com.intellij.psi.impl.cache.impl;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.StandardFileSystems;
 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;
@@ -40,7 +40,7 @@ public class BaseFilterLexerUtil {
       return data;
     }
 
-    final boolean needTodo = content.getFile().getFileSystem() instanceof LocalFileSystem;
+    final boolean needTodo = content.getFile().getFileSystem().getProtocol().equals(StandardFileSystems.FILE_PROTOCOL);
     final boolean needIdIndex = IdTableBuilding.getFileTypeIndexer(content.getFileType()) instanceof LexerBasedIdIndexer;
 
     final IdDataConsumer consumer = needIdIndex? new IdDataConsumer():null;
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java
rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java
diff --git a/platform/lang-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
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/LexerBasedIdIndexer.java
rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/LexerBasedIdIndexer.java
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java
rename to platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java