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

IDEA-57140 Soft wraps are not applied to console sometimes

Browse Source
This commit is contained in:
Denis Zhdanov
2010-08-04 16:45:50 +04:00
parent 970c9b47dc
commit 3354559529
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
+7 -4
View File
@@ -17,7 +17,6 @@ package com.intellij.openapi.editor.impl;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.FoldingModelEx;
import com.intellij.openapi.editor.ex.SoftWrapChangeListener;
import com.intellij.openapi.editor.ex.SoftWrapModelEx;
import com.intellij.openapi.editor.ex.util.EditorUtil;
@@ -347,17 +346,21 @@ public class SoftWrapModelImpl implements SoftWrapModelEx {
}
public void beforeDocumentChangeAtCaret() {
int offset = myEditor.getCaretModel().getOffset();
CaretModel caretModel = myEditor.getCaretModel();
VisualPosition visualCaretPosition = caretModel.getVisualPosition();
if (!isInsideSoftWrap(visualCaretPosition)) {
return;
}
int offset = caretModel.getOffset();
TextChangeImpl softWrap = myStorage.getSoftWrap(offset);
if (softWrap == null) {
return;
}
VisualPosition visualCaretPosition = myEditor.getCaretModel().getVisualPosition();
myDocumentChangeManager.makeHardWrap(softWrap);
// Restore caret position.
myEditor.getCaretModel().moveToVisualPosition(visualCaretPosition);
caretModel.moveToVisualPosition(visualCaretPosition);
}
@Override
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/DefaultSoftWrapApplianceManager.java
+3 -3
View File
@@ -144,13 +144,13 @@ public class DefaultSoftWrapApplianceManager implements SoftWrapApplianceManager
document.addDocumentListener(new LineOrientedDocumentChangeAdapter() {
@Override
public void beforeDocumentChange(int startLine, int endLine, int symbolsDifference) {
for (int i = startLine; i <= endLine; i++) {
myProcessedLogicalLines.remove(i);
}
}
@Override
public void afterDocumentChange(int startLine, int endLine, int symbolsDifference) {
for (int i = startLine; i <= endLine; i++) {
myProcessedLogicalLines.remove(i);
}
}
});
}