From 4eb336aaa918d0efa3048296dc015aa4aba36a63 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 30 Jun 2022 11:36:34 +0200 Subject: [PATCH] IDEA-297124 diff: prefer code navigation inside active diff editor GitOrigin-RevId: d366a295b5ccd07d2df8f01b9ccba7c1b669d4b3 --- .../com/intellij/diff/tools/holders/TextEditorHolder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java b/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java index ee28ff4581e3..2db898140fd0 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java @@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.fileEditor.FileEditorManager; +import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.components.panels.Wrapper; @@ -50,7 +51,10 @@ public class TextEditorHolder extends EditorHolder { } } - if (CommonDataKeys.EDITOR.is(dataId)) { + if (OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { + return editor; + } + else if (CommonDataKeys.EDITOR.is(dataId)) { return editor; } else if (CommonDataKeys.VIRTUAL_FILE.is(dataId)) {