From 5313fcca5087f6a5f35ef76a2e1d51ce2f30a6bc Mon Sep 17 00:00:00 2001
From: "vadim.lomshakov" <vadim.lomshakov@jetbrains.com>
Date: Wed, 26 Apr 2017 17:15:48 +0300
Subject: [PATCH] partial revert

---
 platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java  | 1 -
 .../src/com/intellij/execution/impl/ConsoleViewUtil.java     | 1 -
 .../src/com/intellij/openapi/diff/impl/DiffUtil.java         | 1 -
 .../intellij/openapi/editor/ex/EditorGutterComponentEx.java  | 2 --
 .../openapi/editor/impl/EditorGutterComponentImpl.java       | 5 -----
 5 files changed, 10 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
index a8c250aa8cfd..922145918392 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
@@ -214,7 +214,6 @@ public class DiffUtil {
     editor.getSettings().setShowIntentionBulb(false);
     ((EditorMarkupModel)editor.getMarkupModel()).setErrorStripeVisible(true);
     editor.getGutterComponentEx().setShowDefaultGutterPopup(false);
-    editor.getGutterComponentEx().resetInitialIconAreaWidth();
 
     if (enableFolding) {
       setFoldingModelSupport(editor);
diff --git a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
index 8e0816b76dcd..e9510a62618e 100644
--- a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
+++ b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
@@ -83,7 +83,6 @@ public class ConsoleViewUtil {
       editorSettings.setRightMarginShown(false);
       editorSettings.setCaretRowShown(false);
       editor.getGutterComponentEx().setPaintBackground(false);
-      editor.getGutterComponentEx().resetInitialIconAreaWidth();
 
       editor.putUserData(EDITOR_IS_CONSOLE_VIEW, true);
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
index 8cc5d830a978..290c59241e4e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
@@ -93,7 +93,6 @@ public class DiffUtil {
     EditorEx editor = (EditorEx)(isViewer ? factory.createViewer(document, project) : factory.createEditor(document, project));
     editor.putUserData(DiffManagerImpl.EDITOR_IS_DIFF_KEY, Boolean.TRUE);
     editor.getGutterComponentEx().revalidateMarkup();
-    editor.getGutterComponentEx().resetInitialIconAreaWidth();
 
     if (fileType != null && project != null && !project.isDisposed()) {
       CodeStyleFacade codeStyleFacade = CodeStyleFacade.getInstance(project);
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
index 1d63c853d6d9..9672597457e1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
@@ -64,6 +64,4 @@ public abstract class EditorGutterComponentEx extends JComponent implements Edit
   public abstract void setForceShowRightFreePaintersArea(boolean value);
 
   public abstract void setInitialIconAreaWidth(int width);
-
-  public abstract void resetInitialIconAreaWidth();
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
index 68c5fb52ef7b..0a487d23420b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
@@ -1810,11 +1810,6 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
     myStartIconAreaWidth = width;
   }
 
-  @Override
-  public void resetInitialIconAreaWidth() {
-    myStartIconAreaWidth = START_ICON_AREA_WIDTH;
-  }
-
   private void invokePopup(MouseEvent e) {
     final ActionManager actionManager = ActionManager.getInstance();
     if (myEditor.getMouseEventArea(e) == EditorMouseEventArea.ANNOTATIONS_AREA) {