From 08366a8aab2bc6955892c3c8f408a5fdbd4cbc72 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Tue, 18 Mar 2014 20:54:12 +0400 Subject: [PATCH] registry property to disable injections highlighting WEB-1475 and WEB-11251 partially fixed --- .../daemon/impl/InjectedGeneralHighlightingPass.java | 3 +++ platform/platform-resources-en/src/misc/registry.properties | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java index 0d1f3590699c..3066c0e2f20b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java @@ -36,6 +36,7 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.*; +import com.intellij.openapi.util.registry.Registry; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.psi.impl.source.tree.injected.Place; @@ -72,6 +73,8 @@ public class InjectedGeneralHighlightingPass extends GeneralHighlightingPass imp @Override protected void collectInformationWithProgress(@NotNull final ProgressIndicator progress) { + if (!Registry.is("editor.injected.highlighting.enabled", true)) return; + final Set gotHighlights = new THashSet(100); final List inside = new ArrayList(); diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index 874a1070fe03..d6e463174e9b 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -374,4 +374,7 @@ embed.scene.builder=true dsm.retina.darcula.legend=true dsm.retina.darcula.legend.description=Experimental DSM legend component -ide.scratch.enabled=false \ No newline at end of file +ide.scratch.enabled=false + +editor.injected.highlighting.enabled=true +editor.injected.highlighting.enabled.description=Disables injected fragments highlighting (requires project reopening) \ No newline at end of file