MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- replace editor from focus by selected text editor
This commit is contained in:
Olga Strizhenko
2017-09-18 16:30:40 +03:00
parent 291bb2a609
commit 8ed6636744
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spellchecker/src/com/intellij/spellchecker/quickfixes/ShowSuggestions.java
+3 -13
View File
@@ -17,7 +17,7 @@ package com.intellij.spellchecker.quickfixes;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.impl.EditorComponentImpl;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Iconable;
import com.intellij.psi.PsiElement;
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.List;
@@ -58,19 +57,10 @@ public abstract class ShowSuggestions implements LocalQuickFix, Iconable {
@Nullable
protected Editor getEditor(PsiElement element, @NotNull Project project) {
Editor editor = getEditorFromFocus();
if (editor == null) {
Editor editor = FileEditorManager.getInstance(project).getSelectedTextEditor();
if (InjectedLanguageUtil.findInjectionHost(element) != null) {
editor = InjectedLanguageUtil.openEditorFor(element.getContainingFile(), project);
}
return editor;
}
@Nullable
private static Editor getEditorFromFocus() {
final Component c = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
if (c instanceof EditorComponentImpl) {
return ((EditorComponentImpl)c).getEditor();
}
return null;
}
}