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

Generate Test: do not reset position when navigating to a just-closed file

Browse Source
This commit is contained in:
Anton Makeev
2010-06-27 18:24:38 +04:00
parent 8d6a63fed3
commit 7700e6501c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java
+7 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileEditor.impl.EditorHistoryManager;
import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.PopupChooserBuilder;
import com.intellij.openapi.util.TextRange;
@@ -100,8 +101,13 @@ public final class NavigationUtil {
VirtualFile vFile = file.getVirtualFile();
if (vFile == null) return false;
if (!EditorHistoryManager.getInstance(elt.getProject()).hasBeenOpen(vFile)) return false;
final FileEditorManager fem = FileEditorManager.getInstance(elt.getProject());
if (!fem.isFileOpen(vFile)) return false;
if (!fem.isFileOpen(vFile)) {
fem.openFile(vFile, true);
return true;
}
final TextRange range = elt.getTextRange();
if (range == null) return false;
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java
+7
View File
@@ -229,6 +229,13 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
return result;
}
public boolean hasBeenOpen(@NotNull VirtualFile f) {
for (HistoryEntry each : myEntriesList) {
if (each.myFile == f) return true;
}
return false;
}
/**
* Removes specified <code>file</code> from history. The method does
* nothing if <code>file</code> is not in the history.