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

EA-21828 - SOE: DefaultEditorTextRepresentationHelper.textWidth

Browse Source
This commit is contained in:
Denis Zhdanov
2010-09-16 11:51:46 +04:00
parent 5f92621cf1
commit 192bac6e7a
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+19 -18
View File
@@ -1085,24 +1085,25 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
private int logicalToVisualLine(int line) {
assertReadAccess();
if (!myFoldingModel.isFoldingEnabled()) return line;
int offset = line >= myDocument.getLineCount() ? myDocument.getTextLength() : myDocument.getLineStartOffset(line);
FoldRegion outermostCollapsed = myFoldingModel.getCollapsedRegionAtOffset(offset);
if (outermostCollapsed != null && offset > outermostCollapsed.getStartOffset()) {
if (offset < getDocument().getTextLength()) {
offset = outermostCollapsed.getStartOffset();
return offsetToVisualLine(offset);
}
else {
offset = outermostCollapsed.getEndOffset() + 3; // WTF?
}
}
line -= myFoldingModel.getFoldedLinesCountBefore(offset);
return line;
return logicalToVisualPosition(new LogicalPosition(line, 0)).line;
//if (!myFoldingModel.isFoldingEnabled()) return line;
//
//
//int offset = line >= myDocument.getLineCount() ? myDocument.getTextLength() : myDocument.getLineStartOffset(line);
//
//FoldRegion outermostCollapsed = myFoldingModel.getCollapsedRegionAtOffset(offset);
//if (outermostCollapsed != null && offset > outermostCollapsed.getStartOffset()) {
// if (offset < getDocument().getTextLength()) {
// offset = outermostCollapsed.getStartOffset();
// return offsetToVisualLine(offset);
// }
// else {
// offset = outermostCollapsed.getEndOffset() + 3; // WTF?
// }
//}
//
//line -= myFoldingModel.getFoldedLinesCountBefore(offset);
//return line;
}
@NotNull