MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't perform document commit in action update - it can take a long time

Browse Source
This commit is contained in:
Dmitry Batrak
2016-03-10 20:26:22 +03:00
parent d20c2ae8b9
commit 18ce2c6070
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/BaseMoveHandler.java
+6 -15
View File
@@ -51,8 +51,11 @@ public abstract class BaseMoveHandler extends EditorWriteActionHandler {
if (file != null) { if (file != null) {
final MoverWrapper mover = getSuitableMover(editor, file); final MoverWrapper mover = getSuitableMover(editor, file);
if (mover != null) { if (mover != null && mover.getInfo().toMove2 != null) {
mover.move(editor,file); LineRange range = mover.getInfo().toMove;
if ((range.startLine > 0 || isDown) && (range.endLine < document.getLineCount() || !isDown)) {
mover.move(editor, file);
}
} }
} }
} }
@@ -62,19 +65,7 @@ public abstract class BaseMoveHandler extends EditorWriteActionHandler {
if (editor.isViewer() || editor.isOneLineMode()) return false; if (editor.isViewer() || editor.isOneLineMode()) return false;
final Project project = editor.getProject(); final Project project = editor.getProject();
if (project == null || project.isDisposed()) return false; if (project == null || project.isDisposed()) return false;
final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project); return true;
final Document document = editor.getDocument();
documentManager.commitDocument(document);
PsiFile psiFile = documentManager.getPsiFile(document);
PsiFile file = getRoot(psiFile, editor);
if (file == null) return false;
final MoverWrapper mover = getSuitableMover(editor, file);
if (mover == null || mover.getInfo().toMove2 == null) return false;
final int maxLine = editor.offsetToLogicalPosition(editor.getDocument().getTextLength()).line;
final LineRange range = mover.getInfo().toMove;
if (range.startLine == 0 && !isDown) return false;
return range.endLine <= maxLine || !isDown;
} }
@Nullable @Nullable