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

SSR: don't use selection if the editor does not have the focus

Browse Source
This commit is contained in:
Bas Leijdekkers
2016-09-14 17:47:01 +02:00
parent 72ed5aa09b
commit 5e86faaa32
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchContext.java
+7 -4
View File
@@ -3,7 +3,6 @@ package com.intellij.structuralsearch.plugin.ui;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.vfs.VirtualFile;
@@ -16,10 +15,12 @@ import com.intellij.psi.PsiManager;
public final class SearchContext {
private final PsiFile file;
private final Project project;
private final Editor editor;
private SearchContext(Project project, PsiFile file) {
private SearchContext(Project project, PsiFile file, Editor editor) {
this.project = project;
this.file = file;
this.editor = editor;
}
public PsiFile getFile() {
@@ -41,10 +42,12 @@ public final class SearchContext {
if (vFile != null && (file == null || !vFile.equals(file.getContainingFile().getVirtualFile()))) {
file = PsiManager.getInstance(project).findFile(vFile);
}
return new SearchContext(project, file);
final Editor editor = CommonDataKeys.EDITOR.getData(context);
return new SearchContext(project, file, editor);
}
public Editor getEditor() {
return FileEditorManager.getInstance(project).getSelectedTextEditor();
return editor;
}
}