Merge remote-tracking branch 'origin/master'

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()) {

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