1 files changed, 10 insertions, 5 deletions
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 f20a7340edd1..b8f27b43a488 100644
--- a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
+++ b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
@@ -40,8 +40,10 @@ import com.intellij.util.containers.FactoryMap;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static com.intellij.execution.ui.ConsoleViewContentType.registerNewConsoleViewType;
 
@@ -60,8 +62,9 @@ public class ConsoleViewUtil {
     return editor;
   }
 
-  public static void setupConsoleEditor(final EditorEx editor, final boolean foldingOutlineShown, final boolean lineMarkerAreaShown) {
+  public static void setupConsoleEditor(@NotNull final EditorEx editor, final boolean foldingOutlineShown, final boolean lineMarkerAreaShown) {
     ApplicationManager.getApplication().runReadAction(new Runnable() {
+      @Override
       public void run() {
         editor.setSoftWrapAppliancePlace(SoftWrapAppliancePlaces.CONSOLE);
 
@@ -73,6 +76,7 @@ public class ConsoleViewUtil {
         editorSettings.setAdditionalPageAtBottom(false);
         editorSettings.setAdditionalColumnsCount(0);
         editorSettings.setAdditionalLinesCount(0);
+        editorSettings.setRightMarginShown(false);
 
         editor.putUserData(EDITOR_IS_CONSOLE_VIEW, true);
 
@@ -82,12 +86,12 @@ public class ConsoleViewUtil {
         }
         editor.setColorsScheme(scheme);
         scheme.setColor(EditorColors.CARET_ROW_COLOR, null);
-        scheme.setColor(EditorColors.RIGHT_MARGIN_COLOR, null);
       }
     });
   }
 
-  public static DelegateColorScheme updateConsoleColorScheme(EditorColorsScheme scheme) {
+  @NotNull
+  public static DelegateColorScheme updateConsoleColorScheme(@NotNull EditorColorsScheme scheme) {
     return new DelegateColorScheme(scheme) {
       @NotNull
       @Override
@@ -129,12 +133,13 @@ public class ConsoleViewUtil {
     };
   }
 
-  public static boolean isConsoleViewEditor(Editor editor) {
+  public static boolean isConsoleViewEditor(@NotNull Editor editor) {
     return editor.getUserData(EDITOR_IS_CONSOLE_VIEW) == Boolean.TRUE;
   }
 
   // @noinspection MismatchedQueryAndUpdateOfCollection
   private static final Map<List<TextAttributesKey>, Key> ourContentTypes = Collections.synchronizedMap(new FactoryMap<List<TextAttributesKey>, Key>() {
+    @Override
     protected Key create(List<TextAttributesKey> keys) {
       EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme();
       TextAttributes result = scheme.getAttributes(HighlighterColors.TEXT);