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

diff: do not require Project in "Compare with Selection" action

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-09-11 20:13:25 +03:00
parent 67ca05f306
commit 3b8a4e098e
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java
+5 -9
View File
@@ -44,16 +44,12 @@ import org.jetbrains.annotations.Nullable;
public class CompareClipboardWithSelectionAction extends BaseShowDiffAction {
@Nullable
private static Editor getEditor(@NotNull AnActionEvent e) {
Project project = e.getProject();
if (project == null) return null;
Editor editor = e.getData(CommonDataKeys.EDITOR);
if (editor != null) return editor;
editor = FileEditorManager.getInstance(project).getSelectedTextEditor();
if (editor != null) return editor;
return null;
Project project = e.getProject();
if (project == null) return null;
return FileEditorManager.getInstance(project).getSelectedTextEditor();
}
@Nullable
@@ -81,7 +77,7 @@ public class CompareClipboardWithSelectionAction extends BaseShowDiffAction {
@Nullable
@Override
protected DiffRequest getDiffRequest(@NotNull AnActionEvent e) {
Project project = e.getRequiredData(CommonDataKeys.PROJECT);
Project project = e.getProject();
Editor editor = getEditor(e);
FileType editorFileType = getEditorFileType(e);
assert editor != null;
@@ -103,7 +99,7 @@ public class CompareClipboardWithSelectionAction extends BaseShowDiffAction {
}
@NotNull
private static DocumentContent createContent(@NotNull Project project, @NotNull Editor editor, @Nullable FileType type) {
private static DocumentContent createContent(@Nullable Project project, @NotNull Editor editor, @Nullable FileType type) {
DocumentContent content = DiffContentFactory.getInstance().create(project, editor.getDocument(), type);
SelectionModel selectionModel = editor.getSelectionModel();