Spellchecker: WI-36470 Spellchecking: Quick fix "Change to..." works incorrectly for injected language

This commit is contained in:
Olga Strizhenko
2017-09-18 16:30:40 +03:00
parent c07724c67a
commit f0beb9f456
@@ -30,6 +30,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.List;
import static com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil.findInjectionHost;
public abstract class ShowSuggestions implements LocalQuickFix, Iconable {
@@ -57,10 +58,8 @@ public abstract class ShowSuggestions implements LocalQuickFix, Iconable {
@Nullable
protected Editor getEditor(PsiElement element, @NotNull Project project) {
Editor editor = FileEditorManager.getInstance(project).getSelectedTextEditor();
if (InjectedLanguageUtil.findInjectionHost(element) != null) {
editor = InjectedLanguageUtil.openEditorFor(element.getContainingFile(), project);
}
return editor;
return findInjectionHost(element) != null
? InjectedLanguageUtil.openEditorFor(element.getContainingFile(), project)
: FileEditorManager.getInstance(project).getSelectedTextEditor();
}
}