From 6ca4b6b883c1f8dd1ac4379f41aac73afcb3e461 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Tue, 24 Feb 2015 10:35:09 +0300 Subject: [PATCH] IDEA-136798 Switching between editors does not restore scroll position properly when soft-wraps are involved --- .../com/intellij/openapi/editor/impl/SoftWrapModelImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java index d39877081825..e234be4f0b2a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java @@ -185,6 +185,7 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentLi if ((myUseSoftWraps ^ softWrapsUsedBefore) || (tabWidthBefore >= 0 && myTabWidth != tabWidthBefore) || fontsChanged) { myApplianceManager.reset(); myDeferredFoldRegions.clear(); + myStorage.removeAll(); myEditor.getScrollingModel().scrollToCaret(ScrollType.CENTER); } } @@ -286,9 +287,6 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentLi * @return total number of soft wrap-introduced new visual lines */ public int getSoftWrapsIntroducedLinesNumber() { - if (!isSoftWrappingEnabled()) { - return 0; - } return myStorage.getSoftWraps().size(); // Assuming that soft wrap has single line feed all the time }