From b3527d9a20f4b9391e98b426beb2548fb3efc0fe Mon Sep 17 00:00:00 2001 From: Ivan Bessonov Date: Fri, 1 Jul 2016 16:06:25 +0300 Subject: [PATCH] IDEA-CR-11785 Allow getting file info from FileIndex for injected files --- .../daemon/impl/analysis/HighlightingSettingsPerFile.java | 3 --- .../com/intellij/injected/editor/VirtualFileWindowImpl.java | 5 +++++ .../src/com/intellij/openapi/roots/impl/FileIndexBase.java | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java index 58c0c244947e..31828516d7c0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java @@ -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) { diff --git a/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java b/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java index 8d34f85da24a..43605a432d8b 100644 --- a/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java +++ b/platform/lang-impl/src/com/intellij/injected/editor/VirtualFileWindowImpl.java @@ -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(); + } } \ No newline at end of file diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java index 746e227fdf82..c0ca9d99a3bd 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java @@ -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); }