From 112d88a93b51e8cda7a10aa6d0f7e8ca1c31f423 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 5 Dec 2014 17:47:52 +0300
Subject: [PATCH 1/2] call gutter.updateSize on componentResized, editor layout
 is called too often (e.g. on scrolling)

---
 .../com/intellij/openapi/editor/impl/EditorImpl.java | 12 +-----------
 1 file changed, 1 insertion(+), 11 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 c8833a28f49f..d11f9fb6b879 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
@@ -959,6 +959,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       public void componentResized(@NotNull ComponentEvent e) {
         myMarkupModel.recalcEditorDimensions();
         myMarkupModel.repaint(-1, -1);
+        myGutterComponent.updateSize();
       }
     });
   }
@@ -6754,17 +6755,6 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       setupCorners();
     }
 
-    @Override
-    public void layout() {
-      super.layout();
-      if (isInDistractionFreeMode()) {
-        // re-calc gutter extra size after editor size is set
-        // & layout once again to avoid blinking
-        myGutterComponent.updateSize();
-        super.layout();
-      }
-    }
-
     @Override
     protected void processMouseWheelEvent(@NotNull MouseWheelEvent e) {
       if (mySettings.isWheelFontChangeEnabled() && !MouseGestureManager.getInstance().hasTrackpad()) {

From 87e5305613450409b90fab04253df2bee7482345 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Fri, 5 Dec 2014 18:01:25 +0300
Subject: [PATCH 2/2] filename is not used with builtins module

---
 python/helpers/test_generator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/helpers/test_generator.py b/python/helpers/test_generator.py
index 69274d074725..a0be69e55f69 100644
--- a/python/helpers/test_generator.py
+++ b/python/helpers/test_generator.py
@@ -292,7 +292,7 @@ class TestSpecialCases(unittest.TestCase):
             import __builtin__ as the_builtins
 
             self.builtins_name = the_builtins.__name__
-        self.m = ModuleRedeclarator(the_builtins, None, '/dev/null', doing_builtins=True)
+        self.m = ModuleRedeclarator(the_builtins, None, None, doing_builtins=True)
 
     def _testBuiltinFuncName(self, func_name, expected):
         class_name = None