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

Fixing CPP-11457: Navigation between marked occurrences - when caret leaves the visible area, scroll view area in the way so that caret is in the center

Browse Source
This commit is contained in:
Petr Kudriavtsev
2017-12-14 14:02:57 +03:00
parent 92f9f61375
commit 65970e0dd6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoElementUnderCaretUsageBase.java
+10 -9
View File
@@ -7,15 +7,13 @@ import com.intellij.codeInsight.CodeInsightActionHandler;
import com.intellij.codeInsight.actions.BaseCodeInsightAction;
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorModificationUtil;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
import java.util.Comparator;
/*package*/ abstract class GotoElementUnderCaretUsageBase extends BaseCodeInsightAction implements CodeInsightActionHandler {
@@ -58,9 +56,9 @@ import java.util.Comparator;
return true;
});
if (!next.isNull()) {
moveCaret(editor, editor.getCaretModel().getCurrentCaret(), next.get());
moveCaret(editor, next.get());
} else if (!first.isNull()) {
moveCaret(editor, editor.getCaretModel().getCurrentCaret(), first.get());
moveCaret(editor, first.get());
} else {
// It's ok, do nothing.
}
@@ -71,10 +69,13 @@ import java.util.Comparator;
return false;
}
private static void moveCaret(Editor editor, Caret caret, int offset) {
private static void moveCaret(Editor editor, int toOffset) {
Caret caret = editor.getCaretModel().getCurrentCaret();
caret.removeSelection();
caret.moveToOffset(offset);
EditorModificationUtil.scrollToCaret(editor);
caret.moveToOffset(toOffset);
if (caret == editor.getCaretModel().getPrimaryCaret()) {
editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
}
}
protected enum Direction {