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

revert commit 86d3361 as it's causing exceptions on editor opening

Browse Source
This commit is contained in:
Dmitry Batrak
2015-11-30 11:46:42 +03:00
parent 86d3361105
commit 65d61599f8
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
-4
View File
@@ -754,10 +754,6 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedInternalDo
return dumpState();
}
public boolean isDirty() {
return myDirty;
}
/**
* Defines generic interface for the command that may be proceeded in both <code>'soft wraps aware'</code> and
* <code>'soft wraps unaware'</code> modes.
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorSizeManager.java
-15
View File
@@ -70,10 +70,6 @@ class EditorSizeManager implements PrioritizedDocumentListener, Disposable, Fold
private int myFoldingChangeStartOffset = Integer.MAX_VALUE;
private int myFoldingChangeEndOffset = Integer.MIN_VALUE;
private boolean myDirty; // true if we cannot calculate preferred size now because soft wrap model was invalidated after editor
// became hidden. myLineWidths contents is irrelevant in such a state. Previously calculated preferred size
// is kept until soft wraps will be recalculated and size calculations will become possible
private final List<TextRange> myDeferredRanges = new ArrayList<TextRange>();
private final SoftWrapAwareDocumentParsingListenerAdapter mySoftWrapChangeListener = new SoftWrapAwareDocumentParsingListenerAdapter() {
@@ -183,7 +179,6 @@ class EditorSizeManager implements PrioritizedDocumentListener, Disposable, Fold
private int getPreferredWidth() {
if (myWidthInPixels < 0) {
assert !myDocument.isInBulkUpdate();
assert !myDirty;
myWidthInPixels = calculatePreferredWidth();
}
validateMaxLineWithExtension();
@@ -278,11 +273,6 @@ class EditorSizeManager implements PrioritizedDocumentListener, Disposable, Fold
}
private void doInvalidateRange(int startOffset, int endOffset) {
if (myDirty) return;
if (myEditor.getSoftWrapModel().isDirty()) {
myDirty = true;
return;
}
myWidthInPixels = -1;
int startVisualLine = myView.offsetToVisualLine(startOffset, false);
int endVisualLine = myView.offsetToVisualLine(endOffset, true);
@@ -319,11 +309,6 @@ class EditorSizeManager implements PrioritizedDocumentListener, Disposable, Fold
}
private void onTextLayoutPerformed(int startOffset, int endOffset) {
if (myDirty) return;
if (myEditor.getSoftWrapModel().isDirty()) {
myDirty = true;
return;
}
boolean purePaintingMode = myEditor.isPurePaintingMode();
boolean foldingEnabled = myEditor.getFoldingModel().isFoldingEnabled();
myEditor.setPurePaintingMode(false);