From cf8b6d2f3ef7965d0b9d9886bcb42d0499e64d3d Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 29 Apr 2013 15:15:03 +0400 Subject: [PATCH] navigation to class fixed if file not opened (IDEADEV-41617 re-fixed) --- .../testSrc/com/intellij/navigation/GotoClassTest.java | 1 + .../com/intellij/codeInsight/navigation/NavigationUtil.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/navigation/GotoClassTest.java b/java/java-tests/testSrc/com/intellij/navigation/GotoClassTest.java index a8ae27721686..e9e1b5f79706 100644 --- a/java/java-tests/testSrc/com/intellij/navigation/GotoClassTest.java +++ b/java/java-tests/testSrc/com/intellij/navigation/GotoClassTest.java @@ -34,6 +34,7 @@ public class GotoClassTest extends FileEditorManagerTestCase { getEditor(virtualFile).getCaretModel().moveToOffset(identifierOffset + 3); // it's still inside the class, so keep it + myManager.closeAllFiles(); NavigationUtil.activateFileWithPsiElement(psiClass); assertEquals(identifierOffset + 3, getOffset(virtualFile)); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java index 18e526855f7b..c47ab65e8c30 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java @@ -160,7 +160,7 @@ public final class NavigationUtil { final FileEditorManager fem = FileEditorManager.getInstance(elt.getProject()); if (!fem.isFileOpen(vFile)) { - return false; + fem.openFile(vFile, true, searchForOpen); } final TextRange range = elt.getTextRange(); @@ -171,9 +171,7 @@ public final class NavigationUtil { if (editor instanceof TextEditor) { final Editor text = ((TextEditor)editor).getEditor(); final int offset = text.getCaretModel().getOffset(); - if (range.contains(offset)) { - fem.openFile(vFile, true, searchForOpen); return true; } }