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

perform join lines in a single write action under progress

Browse Source
This commit is contained in:
peter
2016-12-08 18:36:26 +01:00
parent 5db819f513
commit 5a812dda29
1 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java
+30 -50
View File
@@ -26,15 +26,13 @@ package com.intellij.codeInsight.editorActions;
import com.intellij.ide.DataManager;
import com.intellij.ide.IdeBundle;
import com.intellij.idea.ActionsBundle;
import com.intellij.lang.CodeDocumentationAwareCommenter;
import com.intellij.lang.Commenter;
import com.intellij.lang.LanguageCommenters;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.impl.ApplicationImpl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
@@ -50,7 +48,6 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.SequentialModalProgressTask;
import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -105,55 +102,38 @@ public class JoinLinesHandler extends EditorActionHandler {
// joining lines, several times if selection is multiline
int lineCount = endLine - startLine;
int line = startLine;
String action = ActionsBundle.actionText(IdeActions.ACTION_EDITOR_JOIN_LINES);
ProgressManager.getInstance().run(new SequentialModalProgressTask.Adapter(project, action) {
final Ref<Integer> caretRestoreOffset = new Ref<>(-1);
int count = 0;
@Override
public boolean isDone() {
return count >= lineCount;
}
@Override
public boolean iteration() {
if (line >= doc.getLineCount() - 1) {
count = lineCount; // finishing iteration
}
else {
new WriteCommandAction<Void>(project, action, "Join lines") {
@Override
protected void run(@NotNull Result<Void> result) throws Throwable {
CodeEditUtil.setNodeReformatStrategy(node -> node.getTextRange().getStartOffset() >= startReformatOffset);
try {
doJoinTwoLines(doc, project, docManager, psiFile, line, caretRestoreOffset);
}
finally {
CodeEditUtil.setNodeReformatStrategy(null);
}
}
}.execute();
}
count++;
getIndicator().setFraction(((double)count)/lineCount);
return isDone();
}
@Override
public void onSuccess() {
if (caret.hasSelection()) {
caret.moveToOffset(caret.getSelectionEnd());
}
else if (caretRestoreOffset.get() != CANNOT_JOIN) {
caret.moveToOffset(caretRestoreOffset.get());
if (caret == editor.getCaretModel().getPrimaryCaret()) { // performance
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
((ApplicationImpl)ApplicationManager.getApplication()).runWriteActionWithProgressInDispatchThread(
"Join Lines", project, null, IdeBundle.message("action.stop"), indicator -> {
Ref<Integer> caretRestoreOffset = new Ref<>(-1);
CodeEditUtil.setNodeReformatStrategy(node -> node.getTextRange().getStartOffset() >= startReformatOffset);
try {
for (int count = 0; count < lineCount; count++) {
indicator.checkCanceled();
indicator.setFraction(((double)count) / lineCount);
ProgressManager.getInstance().executeNonCancelableSection(
() -> doJoinTwoLines(doc, project, docManager, psiFile, line, caretRestoreOffset));
}
caret.removeSelection();
}
finally {
CodeEditUtil.setNodeReformatStrategy(null);
}
positionCaret(editor, caret, caretRestoreOffset.get());
});
}
private static void positionCaret(Editor editor, Caret caret, int caretRestoreOffset) {
if (caret.hasSelection()) {
caret.moveToOffset(caret.getSelectionEnd());
}
else if (caretRestoreOffset != CANNOT_JOIN) {
caret.moveToOffset(caretRestoreOffset);
if (caret == editor.getCaretModel().getPrimaryCaret()) { // performance
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
}
}.setCancelText(IdeBundle.message("action.stop")));
caret.removeSelection();
}
}
private static void doJoinTwoLines(@NotNull DocumentEx doc,