From 42ec74906491dc6a032ae694433ae045cf72d9dc Mon Sep 17 00:00:00 2001 From: Maxim Kropotov Date: Mon, 6 Mar 2017 09:52:20 +0300 Subject: [PATCH] WEB-25750 Intentions: restore "Check RegExp" action --- .../intelliLang/inject/AbstractLanguageInjectionSupport.java | 5 +++++ .../plugins/intelliLang/inject/CommentLanguageInjector.java | 2 ++ .../plugins/intelliLang/inject/LanguageInjectionSupport.java | 2 ++ 3 files changed, 9 insertions(+) diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/AbstractLanguageInjectionSupport.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/AbstractLanguageInjectionSupport.java index 44fab8be2d3d..b5f783937aa6 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/AbstractLanguageInjectionSupport.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/AbstractLanguageInjectionSupport.java @@ -56,6 +56,11 @@ public abstract class AbstractLanguageInjectionSupport extends LanguageInjection return false; } + @Override + public boolean useDefaultCommentInjector() { + return true; + } + @Nullable @Override public BaseInjection findCommentInjection(@NotNull PsiElement host, @Nullable Ref commentRef) { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java index de479811a62e..696bbf5f9436 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/CommentLanguageInjector.java @@ -63,6 +63,8 @@ public class CommentLanguageInjector implements MultiHostInjector { if (support == myInjectorSupport && applicableFound) continue; applicableFound = true; + if (!support.useDefaultCommentInjector()) + continue; BaseInjection injection = support.findCommentInjection(host, null); if (injection == null) continue; if (!InjectorUtils.registerInjectionSimple(host, injection, support, registrar)) continue; diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/LanguageInjectionSupport.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/LanguageInjectionSupport.java index 167ddb4db25a..23230a249c8c 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/LanguageInjectionSupport.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/LanguageInjectionSupport.java @@ -57,6 +57,8 @@ public abstract class LanguageInjectionSupport { public abstract boolean useDefaultInjector(PsiLanguageInjectionHost host); + public abstract boolean useDefaultCommentInjector(); + @Nullable public abstract BaseInjection findCommentInjection(@NotNull PsiElement host, @Nullable Ref commentRef);