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

don't update selection on document changes in bulk mode (IDEA-153495)

Browse Source
This commit is contained in:
Dmitry Batrak
2016-03-25 17:57:10 +03:00
parent 9d6f571065
commit dfdf234ea3
3 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
+2
View File
@@ -125,6 +125,7 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
Document doc = myEditor.getDocument();
if (myOffset > doc.getTextLength() || savedBeforeBulkCaretMarker != null) return;
savedBeforeBulkCaretMarker = doc.createRangeMarker(myOffset, myOffset);
beforeDocumentChange();
}
void onBulkDocumentUpdateFinished() {
@@ -142,6 +143,7 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
}
releaseBulkCaretMarker();
}
documentChanged();
}
public void beforeDocumentChange() {
platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java
+8 -12
View File
@@ -53,15 +53,13 @@ public class SelectionModelImpl implements SelectionModel, PrioritizedDocumentLi
private TextAttributes myTextAttributes;
private DocumentEvent myIsInUpdate;
public SelectionModelImpl(EditorImpl editor) {
myEditor = editor;
}
@Override
public void beforeDocumentChange(DocumentEvent event) {
myIsInUpdate = event;
if (myEditor.getDocument().isInBulkUpdate()) return;
for (Caret caret : myEditor.getCaretModel().getAllCarets()) {
((CaretImpl)caret).beforeDocumentChange();
}
@@ -69,16 +67,14 @@ public class SelectionModelImpl implements SelectionModel, PrioritizedDocumentLi
@Override
public void documentChanged(DocumentEvent event) {
if (myIsInUpdate == event) {
myIsInUpdate = null;
myEditor.getCaretModel().doWithCaretMerging(new Runnable() {
public void run() {
for (Caret caret : myEditor.getCaretModel().getAllCarets()) {
((CaretImpl)caret).documentChanged();
}
if (myEditor.getDocument().isInBulkUpdate()) return;
myEditor.getCaretModel().doWithCaretMerging(new Runnable() {
public void run() {
for (Caret caret : myEditor.getCaretModel().getAllCarets()) {
((CaretImpl)caret).documentChanged();
}
});
}
}
});
}
@Override
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java
+31
View File
@@ -22,6 +22,10 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.FoldRegion;
import com.intellij.openapi.editor.LogicalPosition;
import com.intellij.openapi.editor.VisualPosition;
import com.intellij.openapi.editor.event.CaretAdapter;
import com.intellij.openapi.editor.event.CaretEvent;
import com.intellij.openapi.editor.event.SelectionEvent;
import com.intellij.openapi.editor.event.SelectionListener;
import com.intellij.openapi.editor.ex.DocumentEx;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.util.EditorUtil;
@@ -329,4 +333,31 @@ public class EditorImplTest extends AbstractEditorTest {
Rectangle visibleArea = myEditor.getScrollingModel().getVisibleArea();
assertTrue(visibleArea.contains(caretPoint));
}
public void testCaretAndSelectionEventsInBulkMode() throws Exception {
initText("abc<selection>def<caret></selection>");
StringBuilder output = new StringBuilder();
CaretAdapter caretListener = new CaretAdapter() {
@Override
public void caretPositionChanged(CaretEvent e) {
output.append("caret:").append(e.getNewPosition());
}
};
SelectionListener selectionListener = new SelectionListener() {
@Override
public void selectionChanged(SelectionEvent e) {
output.append("selection:").append(e.getNewRange());
}
};
myEditor.getCaretModel().addCaretListener(caretListener);
myEditor.getSelectionModel().addSelectionListener(selectionListener);
((DocumentEx)myEditor.getDocument()).setInBulkUpdate(true);
WriteCommandAction.runWriteCommandAction(ourProject, () -> {myEditor.getDocument().insertString(0, " ");});
assertEquals("", output.toString());
((DocumentEx)myEditor.getDocument()).setInBulkUpdate(false);
myEditor.getSelectionModel().removeSelectionListener(selectionListener);
myEditor.getCaretModel().removeCaretListener(caretListener);
assertEquals("caret:LogicalPosition: (0, 7)selection:(4,7)", output.toString());
checkResultByText(" abc<selection>def<caret></selection>");
}
}