IDEA-59034 Editor: Modify default wrap strategy in order to prefer wrap on comma if possible

Fixing tests
This commit is contained in:
Denis Zhdanov
2010-09-23 17:29:47 +04:00
parent be3a4bb1ea
commit 5fd1f8265e
2 changed files with 3 additions and 3 deletions
@@ -127,7 +127,7 @@ public class GenericLineWrapPositionStrategy implements LineWrapPositionStrategy
}
}
return maxPreferredOffsetToUse;
return endOffset;
}
/**
@@ -419,7 +419,7 @@ public class SoftWrapApplianceManager implements FoldingListener, DocumentListen
myLineWrapPositionStrategy = LanguageLineWrapPositionStrategy.INSTANCE.forEditor(myEditor);
}
int softWrapOffset = myLineWrapPositionStrategy.calculateWrapPosition(
document.getCharsSequence(), minOffset, maxOffset, preferredOffset, minOffset != preferredOffset
document.getCharsSequence(), minOffset, maxOffset, preferredOffset, true
);
if (softWrapOffset >= lineData.endLineOffset) {
return null;
@@ -625,7 +625,7 @@ public class SoftWrapApplianceManager implements FoldingListener, DocumentListen
int endLine = document.getLineNumber(endRange.getEndOffset());
int endOffset = document.getLineEndOffset(endLine);
int textLength = document.getTextLength();
if (textLength > 0 && endOffset >= textLength) {
if (textLength > 0 && endOffset > textLength) {
endOffset = textLength - 1;
}
endRange = new TextRange(document.getLineStartOffset(startLine), endOffset);