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

bring back heuristic to move caret after text insertion at caret position

Browse Source 
many tests have failed without it being applied at postponed formatting stage
(for IDEA-135620)
This commit is contained in:
Dmitry Batrak
2016-10-24 14:55:04 +03:00
parent 8a9b2638b8
commit fb495ec1dc
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
+17 -1
View File
@@ -38,6 +38,7 @@ import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.DocumentUtil;
import com.intellij.util.diff.FilesTooBigForDiffException;
import com.intellij.util.text.CharArrayUtil;
import com.intellij.util.ui.EmptyClipboardOwner;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -1471,7 +1472,17 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
protected void changedUpdateImpl(@NotNull DocumentEvent e) {
int oldOffset = intervalStart();
super.changedUpdateImpl(e);
if (!isValid()) {
if (isValid()) {
// Under certain conditions, when text is inserted at caret position, we position caret at the end of inserted text.
// Ideally, client code should be responsible for positioning caret after document modification, but in case of
// postponed formatting (after PSI modifications), this is hard to implement, so a heuristic below is used.
if (e.getOldLength() == 0 && oldOffset == e.getOffset() && needToShiftWhiteSpaces(e)) {
int afterInserted = e.getOffset() + e.getNewLength();
setIntervalStart(afterInserted);
setIntervalEnd(afterInserted);
}
}
else {
setValid(true);
int newOffset = Math.min(intervalStart(), e.getOffset() + e.getNewLength());
if (!((DocumentEx)e.getDocument()).isInBulkUpdate() && e.isWholeTextReplaced()) {
@@ -1494,6 +1505,11 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
myLeansTowardsLargerOffsets = false;
}
}
private boolean needToShiftWhiteSpaces(final DocumentEvent e) {
return e.getOffset() > 0 && Character.isWhitespace(e.getDocument().getImmutableCharSequence().charAt(e.getOffset() - 1)) &&
CharArrayUtil.containsOnlyWhiteSpaces(e.getNewFragment()) && !CharArrayUtil.containLineBreaks(e.getNewFragment());
}
}
class SelectionMarker extends RangeMarkerImpl {