editor scrollbar reworking (IDEA-131263)

2026-09-27 10:03:11 +07:00 · 2014-11-18 18:45:17 +03:00
parent d593db032a
commit d33685207b
26 changed files with 102 additions and 77 deletions
@@ -111,7 +111,7 @@ public class HighlightDisplayLevel {
    }
  }

-  private static final int EMPTY_ICON_DIM = 12;
+  private static final int EMPTY_ICON_DIM = 13;

  public static Icon createIconByKey(@NotNull TextAttributesKey key) {
    for (IconCreator creator : Extensions.getExtensions(IconCreator.EXTENSION_POINT_NAME)) {
@@ -47,6 +47,8 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiCompiledElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.ui.ColorUtil;
+import com.intellij.ui.JBColor;
 import com.intellij.ui.LayeredIcon;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
@@ -64,6 +66,7 @@ import java.util.*;
 import java.util.List;

 public class TrafficLightRenderer implements ErrorStripeRenderer, Disposable {
+  private static final Icon NO_ANALYSIS = HighlightDisplayLevel.createIconByMask(new JBColor(ColorUtil.fromHex("E1E1E1"), ColorUtil.fromHex("757575")));
  private final Project myProject;
  private final Document myDocument;
  private final PsiFile myFile;
@@ -284,12 +287,7 @@ public class TrafficLightRenderer implements ErrorStripeRenderer, Disposable {
  public void paint(Component c, Graphics g, Rectangle r) {
    DaemonCodeAnalyzerStatus status = getDaemonCodeAnalyzerStatus(mySeverityRegistrar);
    Icon icon = getIcon(status);
-
-    int height = icon.getIconHeight();
-    int width = icon.getIconWidth();
-    int x = r.x + (r.width - width) / 2;
-    int y = r.y + (r.height - height) / 2;
-    icon.paintIcon(c, g, x, y);
+    icon.paintIcon(c, g, r.x, r.y);
  }

  @NotNull
@@ -302,7 +300,7 @@ public class TrafficLightRenderer implements ErrorStripeRenderer, Disposable {
    double progress = getOverallProgress(status);
    TruncatingIcon trunc = new TruncatingIcon(icon, icon.getIconWidth(), (int)(icon.getIconHeight() * progress));

-    return new LayeredIcon(trunc, AllIcons.General.InspectionInProgress);
+    return new LayeredIcon(trunc, AllIcons.General.Eye);
  }

  private static double getOverallProgress(@NotNull DaemonCodeAnalyzerStatus status) {
@@ -334,7 +332,7 @@ public class TrafficLightRenderer implements ErrorStripeRenderer, Disposable {
    if (PowerSaveMode.isEnabled()) {
      statusLabel = "Code analysis is disabled in power save mode";
      status.errorAnalyzingFinished = true;
-      icon = AllIcons.Nodes.Plugin;
+      icon = AllIcons.General.SafeMode;
      return result;
    }
    if (status.reasonWhyDisabled != null) {
@@ -342,7 +340,7 @@ public class TrafficLightRenderer implements ErrorStripeRenderer, Disposable {
      statusExtraLine = "(" + status.reasonWhyDisabled + ")";
      passStatusesVisible = true;
      progressBarsCompleted = Boolean.FALSE;
-      icon = AllIcons.General.NoAnalysis;
+      icon = NO_ANALYSIS;
      return result;
    }
    if (status.reasonWhySuspended != null) {
@@ -350,7 +348,7 @@ public class TrafficLightRenderer implements ErrorStripeRenderer, Disposable {
      statusExtraLine = "(" + status.reasonWhySuspended + ")";
      passStatusesVisible = true;
      progressBarsCompleted = Boolean.FALSE;
-      icon = AllIcons.Actions.InspectionsPause;
+      icon = AllIcons.General.InspectionsPause;
      return result;
    }

@@ -43,11 +43,11 @@ import java.lang.reflect.Method;
 public class ButtonlessScrollBarUI extends BasicScrollBarUI {
  private static final Logger LOG = Logger.getInstance("#" + ButtonlessScrollBarUI.class.getName());

-  private JBColor getGradientLightColor() {
+  protected JBColor getGradientLightColor() {
    return jbColor(Gray._251, Gray._95);
  }

-  private JBColor getGradientDarkColor() {
+  protected JBColor getGradientDarkColor() {
    return jbColor(Gray._215, Gray._80);
  }

@@ -712,8 +712,8 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
    if (alwaysPaintThumb()) {
      //noinspection UseJBColor
      g2d.setColor(new Color(baseColor.getRed(), baseColor.getGreen(), baseColor.getBlue(), isDark() ? 100 : 40));
-      //g2d.fillRoundRect(thumbBounds.x, thumbBounds.y, thumbBounds.width, thumbBounds.height, arc, arc);
-      g2d.drawRoundRect(thumbBounds.x, thumbBounds.y, thumbBounds.width, thumbBounds.height, arc, arc);
+      g2d.fillRoundRect(thumbBounds.x, thumbBounds.y, thumbBounds.width, thumbBounds.height, arc, arc);
+      //g2d.drawRoundRect(thumbBounds.x, thumbBounds.y, thumbBounds.width, thumbBounds.height, arc, arc);
    }

    if (!myMacScrollbarHidden) {
@@ -731,7 +731,7 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
    return alwaysShowTrack();
  }

-  private Rectangle getMacScrollBarBounds(Rectangle baseBounds, boolean thumb) {
+  protected Rectangle getMacScrollBarBounds(Rectangle baseBounds, boolean thumb) {
    boolean vertical = isVertical();

    int borderSize = 2;
@@ -768,12 +768,12 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
    return new Rectangle(x, y, width, height);
  }

-  private void paintMaxiThumb(Graphics2D g, Rectangle thumbBounds) {
+  protected void paintMaxiThumb(Graphics2D g, Rectangle thumbBounds) {
    final boolean vertical = isVertical();
    int hGap = vertical ? 2 : 1;
    int vGap = vertical ? 1 : 2;

-    int w = adjustThumbWidth(thumbBounds.width - hGap * 2);
+    int w = thumbBounds.width - hGap * 2;
    int h = thumbBounds.height - vGap * 2;

    // leave one pixel between thumb and right or bottom edge
@@ -810,10 +810,6 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
    return true;
  }

-  protected int adjustThumbWidth(int width) {
-    return width;
-  }
-
  protected Color adjustColor(Color c) {
    if (isMacOverlayScrollbar()) {
      int alpha = (int)((120 + myMouseOverScrollbarExpandLevel * 20) * (1 - myMacScrollbarFadeLevel));
@@ -517,6 +517,12 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
          super.paintThumb(g, c, thumbBounds);
        }
      }
+
+      protected void paintMaxiThumb(Graphics2D g, Rectangle thumbBounds) {
+        int arc = 3;
+        g.setColor(adjustColor(getGradientDarkColor()));
+        g.fillRoundRect(2, 0, thumbBounds.width, thumbBounds.height, arc, arc);
+      }
    });
    myPanel = new JPanel();

@@ -582,7 +588,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi

  @NotNull
  static Color adjustThumbColor(@NotNull Color base, boolean dark) {
-    return ColorUtil.withAlpha(ColorUtil.shift(base, dark ? 1.1 : 0.9), dark ? 0.85 : 0.7);
+    return ColorUtil.withAlpha(ColorUtil.shift(base, dark ? 1.3 : 0.9), 0.7);
  }

  boolean isDarkEnough() {
@@ -82,20 +82,23 @@ import static com.intellij.openapi.editor.ex.util.EditorUtil.isRealFileEditor;

 public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMarkupModel {
  private static final TooltipGroup ERROR_STRIPE_TOOLTIP_GROUP = new TooltipGroup("ERROR_STRIPE_TOOLTIP_GROUP", 0);
-  private static final int ERROR_ICON_WIDTH = 12;
-  private static final int ERROR_ICON_HEIGHT = 12;
+  private static final int ERROR_ICON_WIDTH = 13;
+  private static final int ERROR_ICON_HEIGHT = 13;
+  private static final int THIN_GAP = 2;
  private static final int PREFERRED_WIDTH = ERROR_ICON_WIDTH + 3;
-  public static final int MAX_STRIPE_SIZE = 3;
-  private final EditorImpl myEditor;
+  private static final int MAX_STRIPE_SIZE = 4;
+  private static final int MAC_MAC_THUMB_WIDTH = 10;
+
+  @NotNull private final EditorImpl myEditor;
  // null renderer means we should not show traffic light icon
-  private ErrorStripeRenderer myErrorStripeRenderer;
+  @Nullable private ErrorStripeRenderer myErrorStripeRenderer;
  private final List<ErrorStripeListener> myErrorMarkerListeners = ContainerUtil.createLockFreeCopyOnWriteList();

  private boolean dimensionsAreValid;
  private int myEditorScrollbarTop = -1;
  private int myEditorTargetHeight = -1;
  private int myEditorSourceHeight = -1;
-  private ProperTextRange myDirtyYPositions;
+  @Nullable private ProperTextRange myDirtyYPositions;
  private static final ProperTextRange WHOLE_DOCUMENT = new ProperTextRange(0, 0);

  @NotNull private ErrorStripTooltipRendererProvider myTooltipRendererProvider = new BasicTooltipRendererProvider();
@@ -103,8 +106,8 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
  private int myMinMarkHeight;// height for horizontal, width for vertical stripes
  private static final int myPreviewLines = 5;// Actually preview has myPreviewLines * 2 + 1 lines (above + below + current one)
  private static final int myCachePreviewLines = 100;// Actually cache image has myCachePreviewLines * 2 + 1 lines (above + below + current one)
-  private LightweightHint myEditorPreviewHint = null;
-  private final EditorFragmentRenderer myEditorFragmentRenderer;
+  @Nullable private LightweightHint myEditorPreviewHint = null;
+  @NotNull private final EditorFragmentRenderer myEditorFragmentRenderer;
  private int myRowAdjuster = 0;
  private int myWheelAccumulator = 0;

@@ -115,7 +118,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    setMinMarkHeight(DaemonCodeAnalyzerSettings.getInstance().ERROR_STRIPE_MARK_MIN_HEIGHT);
  }

-  private int offsetToLine(int offset, Document document) {
+  private int offsetToLine(int offset, @NotNull Document document) {
    if (offset < 0) {
      return 0;
    }
@@ -164,7 +167,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    }
  }

-  private boolean showToolTipByMouseMove(final MouseEvent e) {
+  private boolean showToolTipByMouseMove(@NotNull final MouseEvent e) {
    if (myEditor.getVisibleLineCount() == 0) return false;
    MouseEvent me = new MouseEvent(e.getComponent(), e.getID(), e.getWhen(), e.getModifiers(), 0, e.getY() + 1, e.getClickCount(),
                                              e.isPopupTrigger());
@@ -217,7 +220,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      .setShowImmediately(true).setAnimationEnabled(false);
  }

-  private int getVisualLineByEvent(MouseEvent e) {
+  private int getVisualLineByEvent(@NotNull MouseEvent e) {
    return fitLineToEditor(myEditor.offsetToVisualLine(yPositionToOffset(e.getY() + myWheelAccumulator, true)));
  }

@@ -230,12 +233,12 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    return startLine? myEditor.getDocument().getLineStartOffset(logicalLine) : myEditor.getDocument().getLineEndOffset(logicalLine);
  }

-  private void collectRangeHighlighters(MarkupModelEx markupModel, final int visualLine, final Collection<RangeHighlighterEx> highlighters) {
+  private void collectRangeHighlighters(@NotNull MarkupModelEx markupModel, final int visualLine, @NotNull final Collection<RangeHighlighterEx> highlighters) {
    final int startOffset = getOffset(fitLineToEditor(visualLine - myPreviewLines), true);
    final int endOffset = getOffset(fitLineToEditor(visualLine + myPreviewLines), false);
    markupModel.processRangeHighlightersOverlappingWith(startOffset, endOffset, new Processor<RangeHighlighterEx>() {
      @Override
-      public boolean process(RangeHighlighterEx highlighter) {
+      public boolean process(@NotNull RangeHighlighterEx highlighter) {
        if (!highlighter.getEditorFilter().avaliableIn(myEditor)) return true;

        if (highlighter.getErrorStripeMarkColor() != null) {
@@ -249,7 +252,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
  }

  @Nullable
-  private RangeHighlighter getNearestRangeHighlighter(final MouseEvent e) {
+  private RangeHighlighter getNearestRangeHighlighter(@NotNull final MouseEvent e) {
    List<RangeHighlighter> highlighters = new ArrayList<RangeHighlighter>();
    getNearestHighlighters(this, e.getY(), highlighters);
    getNearestHighlighters((MarkupModelEx)DocumentMarkupModel.forDocument(myEditor.getDocument(), myEditor.getProject(), true), e.getY(),
@@ -267,14 +270,14 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    return nearestMarker;
  }

-  private void getNearestHighlighters(MarkupModelEx markupModel,
+  private void getNearestHighlighters(@NotNull MarkupModelEx markupModel,
                                      final int scrollBarY,
-                                      final Collection<RangeHighlighter> nearest) {
+                                      @NotNull final Collection<RangeHighlighter> nearest) {
    int startOffset = yPositionToOffset(scrollBarY - myMinMarkHeight, true);
    int endOffset = yPositionToOffset(scrollBarY + myMinMarkHeight, false);
    markupModel.processRangeHighlightersOverlappingWith(startOffset, endOffset, new Processor<RangeHighlighterEx>() {
      @Override
-      public boolean process(RangeHighlighterEx highlighter) {
+      public boolean process(@NotNull RangeHighlighterEx highlighter) {
        if (!highlighter.getEditorFilter().avaliableIn(myEditor)) return true;

        if (highlighter.getErrorStripeMarkColor() != null) {
@@ -289,7 +292,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    });
  }

-  private void doClick(final MouseEvent e) {
+  private void doClick(@NotNull final MouseEvent e) {
    RangeHighlighter marker = getNearestRangeHighlighter(e);
    int offset;
    LogicalPosition logicalPositionToScroll = null;
@@ -391,6 +394,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    ApplicationManagerEx.getApplicationEx().assertIsDispatchThread();
  }

+  @Nullable
  @Override
  public ErrorStripeRenderer getErrorStripeRenderer() {
    return myErrorStripeRenderer;
@@ -426,7 +430,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    return myEditor.isMirrored();
  }

-  private static final Dimension STRIPE_BUTTON_PREFERRED_SIZE = new Dimension(ERROR_ICON_WIDTH, ERROR_ICON_HEIGHT);
+  private static final Dimension STRIPE_BUTTON_PREFERRED_SIZE = new Dimension(ERROR_ICON_WIDTH + THIN_GAP, ERROR_ICON_HEIGHT + THIN_GAP);

  private class ErrorStripeButton extends JButton {
    private ErrorStripeButton() {
@@ -436,19 +440,18 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    @Override
    public void paint(@NotNull Graphics g) {
      ((ApplicationImpl)ApplicationManager.getApplication()).editorPaintStart();
-
-      final Rectangle bounds = getBounds();
-      final Rectangle errorIconBounds = new Rectangle(0, 0, ERROR_ICON_WIDTH, ERROR_ICON_HEIGHT);
-      errorIconBounds.x = (bounds.width - errorIconBounds.width) / 2 + 2;
-      errorIconBounds.y = (bounds.height - errorIconBounds.height) / 2 - 1;
      
      try {
        if (!transparent()) {
          g.setColor(getEditor().getColorsScheme().getDefaultBackground());
-          g.fillRect(0, 0, bounds.width, bounds.height);
+          Rectangle bounds = getBounds();
+          g.fillRect(bounds.x, bounds.y, bounds.height, bounds.width);
        }
+
        if (myErrorStripeRenderer != null) {
-          myErrorStripeRenderer.paint(this, g, errorIconBounds);
+          int x = THIN_GAP + myMinMarkHeight;
+          final Rectangle b = new Rectangle(x, 0, ERROR_ICON_WIDTH, ERROR_ICON_HEIGHT);
+          myErrorStripeRenderer.paint(this, g, b);
        }
      }
      finally {
@@ -456,21 +459,23 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      }
    }

+    @NotNull
    @Override
    public Dimension getPreferredSize() {
      return STRIPE_BUTTON_PREFERRED_SIZE;
    }
  }
  
-  private boolean transparent() {
+  private static boolean transparent() {
    return Registry.is("editor.transparent.scrollbar", false);
  }

  private class MyErrorPanel extends ButtonlessScrollBarUI implements MouseMotionListener, MouseListener, MouseWheelListener, UISettingsListener {
    private PopupHandler myHandler;
    private JButton myErrorStripeButton;
-    private BufferedImage myCachedTrack;
+    @Nullable private BufferedImage myCachedTrack;

+    @NotNull
    @Override
    protected JButton createDecreaseButton(int orientation) {
      myErrorStripeButton = myErrorStripeRenderer == null ? super.createDecreaseButton(orientation) : new ErrorStripeButton();
@@ -533,7 +538,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    }

    @Override
-    protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) {
+    protected void paintThumb(@NotNull Graphics g, @NotNull JComponent c, Rectangle thumbBounds) {
      if (isMacOverlayScrollbar()) {
        if (!isMirrored()) {
          super.paintThumb(g, c, thumbBounds);
@@ -568,14 +573,30 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      return super.alwaysPaintThumb();
    }

+    @Override
+    protected Rectangle getMacScrollBarBounds(Rectangle baseBounds, boolean thumb) {
+      Rectangle bounds = super.getMacScrollBarBounds(baseBounds, thumb);
+      bounds.width = Math.min(bounds.width, MAC_MAC_THUMB_WIDTH);
+      int b2 =  bounds.width / 2;
+      bounds.x = THIN_GAP + myMinMarkHeight+ ERROR_ICON_WIDTH /2 - b2;
+      
+      return bounds;
+    }
+
+    @Override
+    protected void paintMaxiThumb(@NotNull Graphics2D g, @NotNull Rectangle thumbBounds) {
+      int arc = 3;
+      g.setColor(adjustColor(getGradientDarkColor()));
+      g.fillRoundRect(isMirrored() ? -3 : 2, 0, thumbBounds.width, thumbBounds.height, arc, arc);
+    }
+
    @Override
    protected int getThickness() {
-      int fix = isMacOverlayScrollbar() ? -2 : 0;
-      return super.getThickness() + myMinMarkHeight - 1 + fix;
+      return ERROR_ICON_WIDTH + THIN_GAP + myMinMarkHeight;
    }
    
    @Override
-    protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds) {
+    protected void paintTrack(@NotNull Graphics g, @NotNull JComponent c, @NotNull Rectangle trackBounds) {
      if (transparent()) {
        doPaintTrack(g, c, trackBounds);
      }
@@ -585,7 +606,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    }

    @Override
-    protected void doPaintTrack(Graphics g, JComponent c, Rectangle bounds) {
+    protected void doPaintTrack(@NotNull Graphics g, @NotNull JComponent c, @NotNull Rectangle bounds) {
      if (isMacScrollbarHiddenAndDistractionFreeEnabled()) {
        paintTrackBasement(g, bounds);
        return;
@@ -622,18 +643,19 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      UIUtil.drawImage(g, myCachedTrack, null, 0, 0);
    }

-    private void paintTrackBasement(Graphics g, Rectangle bounds) {
+    private void paintTrackBasement(@NotNull Graphics g, @NotNull Rectangle bounds) {
      if (transparent()) return;
      g.setColor(EditorColorsManager.getInstance().getGlobalScheme().getDefaultBackground());
      g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);
    }

+    @NotNull
    @Override
    protected Color adjustColor(Color c) {
      return isMacOverlayScrollbar() ? super.adjustColor(c) : EditorImpl.adjustThumbColor(super.adjustColor(c), isDark());
    }

-    private void repaint(final Graphics g, int gutterWidth, final int stripeWidth, ProperTextRange yrange) {
+    private void repaint(@NotNull final Graphics g, int gutterWidth, final int stripeWidth, @NotNull ProperTextRange yrange) {
      final Rectangle clip = new Rectangle(0, yrange.getStartOffset(), gutterWidth, yrange.getLength() + myMinMarkHeight);
      paintTrackBasement(g, clip);

@@ -646,7 +668,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
                 (MarkupModelEx)DocumentMarkupModel.forDocument(document, myEditor.getProject(), true));
    }

-    private void drawMarkup(final Graphics g, final int width, int startOffset, int endOffset, MarkupModelEx markup) {
+    private void drawMarkup(@NotNull final Graphics g, final int width, int startOffset, int endOffset, @NotNull MarkupModelEx markup) {
      final Queue<PositionedStripe> thinEnds = new PriorityQueue<PositionedStripe>(5, new Comparator<PositionedStripe>() {
        @Override
        public int compare(@NotNull PositionedStripe o1, @NotNull PositionedStripe o2) {
@@ -667,7 +689,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark

      markup.processRangeHighlightersOverlappingWith(startOffset, endOffset, new Processor<RangeHighlighterEx>() {
        @Override
-        public boolean process(RangeHighlighterEx highlighter) {
+        public boolean process(@NotNull RangeHighlighterEx highlighter) {
          if (!highlighter.getEditorFilter().avaliableIn(myEditor)) return true;

          Color color = highlighter.getErrorStripeMarkColor();
@@ -729,9 +751,9 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    }

    private int drawStripesEndingBefore(int ys,
-                                        Queue<PositionedStripe> ends,
-                                        List<PositionedStripe> stripes,
-                                        Graphics g, int width, int yStart) {
+                                        @NotNull Queue<PositionedStripe> ends,
+                                        @NotNull List<PositionedStripe> stripes,
+                                        @NotNull Graphics g, int width, int yStart) {
      while (!ends.isEmpty()) {
        PositionedStripe endingStripe = ends.peek();
        if (endingStripe.yEnd > ys) break;
@@ -749,7 +771,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      return yStart;
    }

-    private void drawSpot(Graphics g, int width, boolean thinErrorStripeMark, int yStart, int yEnd, Color color) {
+    private void drawSpot(@NotNull Graphics g, int width, boolean thinErrorStripeMark, int yStart, int yEnd, @Nullable Color color) {
      if (color == null) return;
      int paintWidth;
      int x;
@@ -763,7 +785,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
        }
      }
      else {
-        x = myMinMarkHeight + 1;
+        x = myMinMarkHeight + THIN_GAP;
        paintWidth = width;
      }
      g.setColor(color);
@@ -797,7 +819,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      return scrollbar.getWidth();
    }

-    private void doMouseClicked(MouseEvent e) {
+    private void doMouseClicked(@NotNull MouseEvent e) {
      myEditor.getContentComponent().requestFocus();
      int lineCount = getDocument().getLineCount() + myEditor.getSettings().getAdditionalLinesCount();
      if (lineCount == 0) {
@@ -836,7 +858,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    }

    @Override
-    public void mouseWheelMoved(MouseWheelEvent e) {
+    public void mouseWheelMoved(@NotNull MouseWheelEvent e) {
      if (myEditorPreviewHint == null) return;
      myWheelAccumulator += e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL ? e.getUnitsToScroll() * e.getScrollAmount() :
                            e.getWheelRotation() < 0 ? -e.getScrollAmount() : e.getScrollAmount();
@@ -844,9 +866,9 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      showToolTipByMouseMove(e);
    }

-    private TrafficTooltipRenderer myTrafficTooltipRenderer;
+    @Nullable private TrafficTooltipRenderer myTrafficTooltipRenderer;

-    private void showTrafficLightTooltip(MouseEvent e) {
+    private void showTrafficLightTooltip(@NotNull MouseEvent e) {
      if (myTrafficTooltipRenderer == null) {
        myTrafficTooltipRenderer = myTooltipRendererProvider.createTrafficTooltipRenderer(new Runnable() {
          @Override
@@ -908,7 +930,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    }
  }

-  private void showTooltip(MouseEvent e, final TooltipRenderer tooltipObject, @NotNull HintHint hintHint) {
+  private void showTooltip(@NotNull MouseEvent e, final TooltipRenderer tooltipObject, @NotNull HintHint hintHint) {
    TooltipController tooltipController = TooltipController.getInstance();
    tooltipController.showTooltipByMouseMove(myEditor, new RelativePoint(e), tooltipObject,
                                             myEditor.getVerticalScrollbarOrientation() == EditorEx.VERTICAL_SCROLLBAR_RIGHT,
@@ -1003,6 +1025,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
        public void repaintTooltipWindow() {
        }

+        @NotNull
        @Override
        public LightweightHint show(@NotNull Editor editor,
                                    @NotNull Point p,
@@ -1096,8 +1119,8 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
    private int myVisualLine;
    private boolean myShowInstantly;
    private final List<RangeHighlighterEx> myHighlighters = new ArrayList<RangeHighlighterEx>();
-    private BufferedImage myCacheLevel1;
-    private BufferedImage myCacheLevel2;
+    @Nullable private BufferedImage myCacheLevel1;
+    @Nullable private BufferedImage myCacheLevel2;
    private int myCacheStartLine;
    private int myCacheEndLine;
    private int myStartVisualLine;
@@ -1112,7 +1135,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      update(-1, Collections.<RangeHighlighterEx>emptyList(), false);
    }

-    void update(int visualLine, Collection<RangeHighlighterEx> rangeHighlighters, boolean showInstantly) {
+    void update(int visualLine, @NotNull Collection<RangeHighlighterEx> rangeHighlighters, boolean showInstantly) {
      myVisualLine = visualLine;
      myShowInstantly = showInstantly;
      myHighlighters.clear();
@@ -1135,6 +1158,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      });
    }

+    @Nullable
    @Override
    public LightweightHint show(@NotNull final Editor editor,
                                @NotNull Point p,
@@ -1148,6 +1172,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
        final JPanel editorFragmentPreviewPanel = new JPanel() {
          private static final int R = 6;

+          @NotNull
          @Override
          public Dimension getPreferredSize() {
            int width = myEditor.getGutterComponentEx().getWidth() + myEditor.getScrollingModel().getVisibleArea().width;
@@ -1311,7 +1336,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
      return myEditorPreviewHint;
    }

-    private void showEditorHint(HintManagerImpl hintManager, Point point, HintHint hintInfo) {
+    private void showEditorHint(@NotNull HintManagerImpl hintManager, @NotNull Point point, HintHint hintInfo) {
      int flags = HintManager.HIDE_BY_ANY_KEY | HintManager.HIDE_BY_TEXT_CHANGE | HintManager.HIDE_BY_MOUSEOVER |
                  HintManager.HIDE_BY_ESCAPE | HintManager.HIDE_BY_SCROLLING;
      hintManager.showEditorHint(myEditorPreviewHint, myEditor, point, flags, 0, false, hintInfo);
@@ -85,7 +85,6 @@ public class AllIcons {
    public static final Icon GroupByPrefix = IconLoader.getIcon("/actions/GroupByPrefix.png"); // 16x16
    public static final Icon GroupByTestProduction = IconLoader.getIcon("/actions/groupByTestProduction.png"); // 16x16
    public static final Icon Help = IconLoader.getIcon("/actions/help.png"); // 16x16
-    public static final Icon InspectionsPause = IconLoader.getIcon("/actions/inspectionsPause.png"); // 12x12
    public static final Icon Install = IconLoader.getIcon("/actions/install.png"); // 16x16
    public static final Icon IntentionBulb = IconLoader.getIcon("/actions/intentionBulb.png"); // 16x16
    public static final Icon Left = IconLoader.getIcon("/actions/left.png"); // 16x16
@@ -409,6 +408,7 @@ public class AllIcons {
    public static final Icon ExportSettings = IconLoader.getIcon("/general/ExportSettings.png"); // 32x32
    public static final Icon ExternalTools = IconLoader.getIcon("/general/externalTools.png"); // 32x32
    public static final Icon ExternalToolsSmall = IconLoader.getIcon("/general/externalToolsSmall.png"); // 16x16
+    public static final Icon Eye = IconLoader.getIcon("/general/eye.png"); // 13x13
    public static final Icon Filter = IconLoader.getIcon("/general/filter.png"); // 16x16
    public static final Icon Floating = IconLoader.getIcon("/general/floating.png"); // 14x14
    public static final Icon Gear = IconLoader.getIcon("/general/gear.png"); // 21x16
@@ -439,8 +439,8 @@ public class AllIcons {
    public static final Icon Information = IconLoader.getIcon("/general/information.png"); // 16x16
    public static final Icon InformationDialog = IconLoader.getIcon("/general/informationDialog.png"); // 32x32
    public static final Icon InheritedMethod = IconLoader.getIcon("/general/inheritedMethod.png"); // 11x14
-    public static final Icon InspectionInProgress = IconLoader.getIcon("/general/inspectionInProgress.png"); // 11x11
    public static final Icon InspectionsOff = IconLoader.getIcon("/general/inspectionsOff.png"); // 16x16
+    public static final Icon InspectionsPause = IconLoader.getIcon("/general/inspectionsPause.png"); // 12x12
    public static final Icon Jdk = IconLoader.getIcon("/general/jdk.png"); // 16x16
    public static final Icon JetbrainsTvIdea = IconLoader.getIcon("/general/jetbrainsTvIdea.png"); // 32x32
    public static final Icon KeyboardShortcut = IconLoader.getIcon("/general/keyboardShortcut.png"); // 13x13
@@ -456,7 +456,6 @@ public class AllIcons {
    public static final Icon MoreTabs = IconLoader.getIcon("/general/moreTabs.png"); // 16x16
    public static final Icon Mouse = IconLoader.getIcon("/general/mouse.png"); // 32x32
    public static final Icon MouseShortcut = IconLoader.getIcon("/general/mouseShortcut.png"); // 13x13
-    public static final Icon NoAnalysis = IconLoader.getIcon("/general/noAnalysis.png"); // 12x12
    public static final Icon NotificationError = IconLoader.getIcon("/general/notificationError.png"); // 24x24
    public static final Icon NotificationInfo = IconLoader.getIcon("/general/notificationInfo.png"); // 24x24
    public static final Icon NotificationWarning = IconLoader.getIcon("/general/notificationWarning.png"); // 24x24
@@ -481,6 +480,7 @@ public class AllIcons {
    public static final Icon Reset = IconLoader.getIcon("/general/reset.png"); // 16x16
    public static final Icon Run = IconLoader.getIcon("/general/run.png"); // 7x10
    public static final Icon RunWithCoverage = IconLoader.getIcon("/general/runWithCoverage.png"); // 16x16
+    public static final Icon SafeMode = IconLoader.getIcon("/general/safeMode.png"); // 13x13
    public static final Icon SearchEverywhereGear = IconLoader.getIcon("/general/searchEverywhereGear.png"); // 16x16
    public static final Icon SecondaryGroup = IconLoader.getIcon("/general/secondaryGroup.png"); // 16x16
    public static final Icon SeparatorH = IconLoader.getIcon("/general/separatorH.png"); // 17x11