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

Zero-latency typing: skip undo / redo and PSI synchronization changes

Browse Source
This commit is contained in:
Pavel Fatin
2015-08-17 18:49:20 +02:00
parent cc772f3242
commit 1e0891dac5
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
+7
View File
@@ -624,6 +624,13 @@ public class DocumentImpl extends UserDataHolderBase implements DocumentEx {
myGuardsSuppressed = true;
}
// This data is used during the immediate editor painting to detect whether PSI synchronization is in progress.
// PsiToDocumentSynchronizer.doCommitTransaction should probably perform bulk document updates.
// TODO Remove this getter later
public boolean isGuardsSuppressed() {
return myGuardsSuppressed;
}
@Override
public void unSuppressGuardedExceptions() {
myGuardsSuppressed = false;
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+8 -2
View File
@@ -37,6 +37,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.command.UndoConfirmationPolicy;
import com.intellij.openapi.command.undo.UndoManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.actionSystem.*;
@@ -2174,8 +2175,13 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
print(g, newText, point, ascent, font, color);
}
private static boolean canPaintImmediately(@NotNull DocumentEvent e) {
return !contains(e.getOldFragment(), '\n') &&
private boolean canPaintImmediately(@NotNull DocumentEvent e) {
UndoManager undoManager = UndoManager.getInstance(myProject);
return !undoManager.isUndoInProgress() && // Undo / Redo actions might start multiple write actions and make multiple document changes.
!undoManager.isRedoInProgress() && // Can we optimize the subsystem to start only one write action and do a single update?
myDocument instanceof DocumentImpl &&
!((DocumentImpl)myDocument).isGuardsSuppressed() && // Heuristics. Can PsiToDocumentSynchronizer perform bulk document updates?
!contains(e.getOldFragment(), '\n') &&
!contains(e.getNewFragment(), '\n') &&
!(e.getNewLength() == 1 && DOCUMENT_CHARS_TO_SKIP.contains(e.getNewFragment().charAt(0)));
}