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

IDEA-70523 Shortcut to navigate between highlighted usages. FindModel.searchHighlighters is not needed.

Browse Source
This commit is contained in:
andrey.zaytsev
2012-07-12 21:42:02 +04:00
parent 0148512132
commit 412a02bda3
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+16 -25
View File
@@ -240,7 +240,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
@Override
public void setFindWasPerformed() {
isFindWasPerformed = true;
myFindUsagesManager.clearFindingNextUsageInFile();
//myFindUsagesManager.clearFindingNextUsageInFile();
}
@Override
@@ -732,42 +732,33 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
@Override
public boolean findNextUsageInEditor(@NotNull FileEditor fileEditor) {
return findNextUsageInFile(fileEditor, SearchResults.Direction.DOWN);
}
private boolean findNextUsageInFile(FileEditor fileEditor, SearchResults.Direction direction) {
if (fileEditor instanceof TextEditor) {
TextEditor textEditor = (TextEditor)fileEditor;
Editor editor = textEditor.getEditor();
if (tryToFindNextUsageViaEditorSearchComponent(editor, SearchResults.Direction.DOWN)) {
if (tryToFindNextUsageViaEditorSearchComponent(editor, direction)) {
return true;
}
FindModel model = getFindNextModel(editor);
if (model != null && model.searchHighlighters()) {
RangeHighlighter[] highlighters = ((HighlightManagerImpl)HighlightManager.getInstance(myProject)).getHighlighters(editor);
if (highlighters.length > 0) {
return highlightNextHighlighter(highlighters, editor, editor.getCaretModel().getOffset(), true, false);
}
RangeHighlighter[] highlighters = ((HighlightManagerImpl)HighlightManager.getInstance(myProject)).getHighlighters(editor);
if (highlighters.length > 0) {
return highlightNextHighlighter(highlighters, editor, editor.getCaretModel().getOffset(), direction == SearchResults.Direction.DOWN, false);
}
}
return myFindUsagesManager.findNextUsageInFile(fileEditor);
if (direction == SearchResults.Direction.DOWN) {
return myFindUsagesManager.findNextUsageInFile(fileEditor);
} else {
return myFindUsagesManager.findPreviousUsageInFile(fileEditor);
}
}
@Override
public boolean findPreviousUsageInEditor(@NotNull FileEditor fileEditor) {
if (fileEditor instanceof TextEditor) {
TextEditor textEditor = (TextEditor)fileEditor;
Editor editor = textEditor.getEditor();
if (tryToFindNextUsageViaEditorSearchComponent(editor, SearchResults.Direction.UP)) {
return true;
}
FindModel model = getFindNextModel(editor);
if (model != null && model.searchHighlighters()) {
RangeHighlighter[] highlighters = ((HighlightManagerImpl)HighlightManager.getInstance(myProject)).getHighlighters(editor);
if (highlighters.length > 0) {
return highlightNextHighlighter(highlighters, editor, editor.getCaretModel().getOffset(), false, false);
}
}
}
return myFindUsagesManager.findPreviousUsageInFile(fileEditor);
return findNextUsageInFile(fileEditor, SearchResults.Direction.UP);
}
private static boolean highlightNextHighlighter(RangeHighlighter[] highlighters, Editor editor, int offset, boolean isForward, boolean secondPass) {