From 192bac6e7a571b5aaa257801a45f2b98555135a0 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <Denis.Zhdanov@jetbrains.com>
Date: Thu, 16 Sep 2010 11:51:46 +0400
Subject: [PATCH] EA-21828 - SOE:
 DefaultEditorTextRepresentationHelper.textWidth

---
 .../openapi/editor/impl/EditorImpl.java       | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index 6074ba9a15e7..d79006d1b63c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -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