From 13de9ffa5455c19ab4b19957a327c6d728b8f71d Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 17 Nov 2020 15:49:06 +0100 Subject: [PATCH] RegExp: avoid deprecated InjectedLanguageUtil GitOrigin-RevId: 4713d4dcedcc6620fe7dc041da22893845fafcf3 --- .../org/intellij/lang/regexp/intention/CheckRegExpForm.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java b/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java index 3f6535667dd6..77324ee55c6c 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java @@ -6,6 +6,7 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.util.PropertiesComponent; import com.intellij.lang.Language; +import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -35,7 +36,6 @@ import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.ui.EditorTextField; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBScrollBar; @@ -473,7 +473,7 @@ public final class CheckRegExpForm { final RegExpMatcherProvider matcherProvider = RegExpMatcherProvider.EP.forLanguage(regExpFileLanguage); if (matcherProvider != null) { final RegExpMatchResult result = ReadAction.compute(() -> { - final PsiLanguageInjectionHost host = InjectedLanguageUtil.findInjectionHost(regExpFile); + final PsiLanguageInjectionHost host = InjectedLanguageManager.getInstance(regExpFile.getProject()).getInjectionHost(regExpFile); if (host != null) { return matcherProvider.matches(regExpText, regExpFile, host, sampleText, 1000L); } @@ -485,7 +485,7 @@ public final class CheckRegExpForm { } final Integer patternFlags = ReadAction.compute(() -> { - final PsiLanguageInjectionHost host = InjectedLanguageUtil.findInjectionHost(regExpFile); + final PsiLanguageInjectionHost host = InjectedLanguageManager.getInstance(regExpFile.getProject()).getInjectionHost(regExpFile); int flags = 0; if (host != null) { for (RegExpModifierProvider provider : RegExpModifierProvider.EP.allForLanguage(host.getLanguage())) {