From 8657475ff0de4dc5ec672c424af1a56c817c27f9 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 17 Nov 2015 14:31:30 +0300 Subject: [PATCH] IDEA-140542 Forward navigation to already navigated items (ctrl + alt + right )) seems to be broken --- .../impl/ui/ExecutionPointHighlighter.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java index 0bf30bca980d..f1ea1c0174f3 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java @@ -25,7 +25,10 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.impl.DocumentMarkupModel; import com.intellij.openapi.editor.impl.EditorImpl; import com.intellij.openapi.editor.markup.*; +import com.intellij.openapi.fileEditor.FileEditor; +import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; +import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.TextRange; @@ -166,7 +169,18 @@ public class ExecutionPointHighlighter { if (!navigate && myOpenFileDescriptor != null) { fileDescriptor = new OpenFileDescriptor(myProject, myOpenFileDescriptor.getFile()); } - myEditor = fileDescriptor == null ? null : XDebuggerUtilImpl.createEditor(fileDescriptor); + myEditor = null; + if (fileDescriptor != null) { + if (!navigate) { + FileEditor editor = FileEditorManager.getInstance(fileDescriptor.getProject()).getSelectedEditor(fileDescriptor.getFile()); + if (editor instanceof TextEditor) { + myEditor = ((TextEditor)editor).getEditor(); + } + } + if (myEditor == null) { + myEditor = XDebuggerUtilImpl.createEditor(fileDescriptor); + } + } if (myEditor != null) { addHighlighter(); }