IDEA-CR-11785 Allow getting file info from FileIndex for injected files

This commit is contained in:
Ivan Bessonov
2016-07-01 16:06:25 +03:00
parent 31f33739d1
commit b3527d9a20
3 changed files with 9 additions and 3 deletions
@@ -17,7 +17,6 @@
package com.intellij.codeInsight.daemon.impl.analysis;
import com.intellij.lang.Language;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.*;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
@@ -170,8 +169,6 @@ public class HighlightingSettingsPerFile extends HighlightingLevelManager implem
@Override
public boolean shouldInspect(@NotNull PsiElement psiRoot) {
if (ApplicationManager.getApplication().isUnitTestMode()) return true;
final FileHighlightingSetting settingForRoot = getHighlightingSettingForRoot(psiRoot);
if (settingForRoot == FileHighlightingSetting.SKIP_HIGHLIGHTING ||
settingForRoot == FileHighlightingSetting.SKIP_INSPECTION) {
@@ -56,4 +56,9 @@ public class VirtualFileWindowImpl extends LightVirtualFile implements VirtualFi
public String toString() {
return "VirtualFileWindow in " + myDelegate.getPresentableUrl();
}
@Override
public VirtualFile getParent() {
return myDelegate.getParent();
}
}
@@ -1,5 +1,6 @@
package com.intellij.openapi.roots.impl;
import com.intellij.injected.editor.VirtualFileWindow;
import com.intellij.openapi.fileTypes.FileTypeRegistry;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.FileIndex;
@@ -20,6 +21,9 @@ public abstract class FileIndexBase implements FileIndex {
@NotNull
protected DirectoryInfo getInfoForFileOrDirectory(@NotNull VirtualFile file) {
if (file instanceof VirtualFileWindow) {
file = ((VirtualFileWindow)file).getDelegate();
}
return myDirectoryIndex.getInfoForFile(file);
}