From bfca5f972a3b3565ca650cce0bf91a603a3d262c Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 30 Dec 2010 15:14:21 +0300
Subject: [PATCH] EA-22159

---
 .../intellij/openapi/editor/impl/EditorImpl.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 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 b2b776dfbe02..35572d866733 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
@@ -514,7 +514,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     myPlainFontMetrics = null;
 
     boolean softWrapsUsedBefore = mySoftWrapModel.isSoftWrappingEnabled();
-    
+
     mySoftWrapModel.reinitSettings();
     myCaretModel.reinitSettings();
     mySelectionModel.reinitSettings();
@@ -529,7 +529,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       mySizeContainer.reset();
       validateSize();
     }
-    
+
     final EditorColorsScheme scheme =
       myScheme instanceof DelegateColorScheme? ((DelegateColorScheme)myScheme).getDelegate() : myScheme;
     if (scheme instanceof MyColorSchemeDelegate) {
@@ -606,10 +606,10 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     clearCaretThread();
 
     myFocusListeners.clear();
-    
+
     if (myConnection != null) {
       myConnection.disconnect();
-    }
+  }
   }
 
   private void clearCaretThread() {
@@ -3425,7 +3425,6 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       VisualPosition oldVisLeadSelectionStart = selectionModel.getLeadSelectionPosition();
       int oldCaretOffset = getCaretModel().getOffset();
       LogicalPosition oldLogicalCaret = getCaretModel().getLogicalPosition();
-      VisualPosition oldVisualCaret = getCaretModel().getVisualPosition();
       moveCaretToScreenPos(x, y);
       getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
 
@@ -3605,6 +3604,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     myFocusListeners.add(listener);
   }
 
+  @Nullable
   public Project getProject() {
     return myProject;
   }
@@ -5194,9 +5194,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     private int myOldEndLine;
 
     private Dimension mySize;
-
-    private final Object lock       = new Object();
-    private       int    myMaxWidth = -1;
+    private int myMaxWidth = -1;
 
     public synchronized void reset() {
       int lineCount = getDocument().getLineCount();
@@ -5315,7 +5313,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     private void validateSizes() {
       if (!myIsDirty) return;
 
-      synchronized (lock) {
+      synchronized (this) {
         if (!myIsDirty) return;
         int lineCount = Math.min(myLineWidths.size(), myDocument.getLineCount());