1 files changed, 27 insertions, 3 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 c0ffbd10aca4..6160ea58dcdf 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
@@ -2765,8 +2765,25 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       if (hEnd >= lEnd) {
         FoldRegion collapsedFolderAt = myFoldingModel.getCollapsedRegionAtOffset(start);
         if (collapsedFolderAt == null) {
-          drawStringWithSoftWraps(g, chars, start, lEnd - lIterator.getSeparatorLength(), position, clip, effectColor,
-                                  effectType, fontType, currentColor, logicalPosition);
+          int i = drawStringWithSoftWraps(g, chars, start, lEnd - lIterator.getSeparatorLength(), position, clip, effectColor,
+                                                effectType, fontType, currentColor, logicalPosition);
+          final VirtualFile file = getVirtualFile();
+          if (myProject != null && file != null && !isOneLineMode()) {
+            for (EditorLinePainter painter : EditorLinePainter.EP_NAME.getExtensions()) {
+              Collection<LineExtensionInfo> extensions = painter.getLineExtensions(myProject, file, lIterator.getLineNumber());
+              if (extensions != null && !extensions.isEmpty()) {
+                for (LineExtensionInfo info : extensions) {
+                  drawStringWithSoftWraps(g, info.getText(), 0, info.getText().length(), position, clip,
+                                          info.getEffectColor() == null ? effectColor : info.getEffectColor(),
+                                          info.getEffectType() == null ? effectType : info.getEffectType(),
+                                          info.getFontType(),
+                                          info.getColor() == null ? currentColor : info.getColor(),
+                                          logicalPosition);
+                }
+              }
+            }
+          }
+
           position.x = 0;
           if (position.y > clip.y + clip.height) {
             break;
@@ -6749,10 +6766,17 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     public Insets getBorderInsets(Component c) {
       Container splitters = SwingUtilities.getAncestorOfClass(EditorsSplitters.class, c);
       boolean thereIsSomethingAbove = !SystemInfo.isMac || UISettings.getInstance().SHOW_MAIN_TOOLBAR || UISettings.getInstance().SHOW_NAVIGATION_BAR ||
-                                      myProject != null && !ToolWindowManagerEx.getInstanceEx(myProject).getIdsOn(ToolWindowAnchor.TOP).isEmpty();
+                                      toolWindowIsNotEmpty();
       return splitters == null ? super.getBorderInsets(c) : new Insets(thereIsSomethingAbove ? 1 : 0, 0, 0, 0);
     }
 
+    public boolean toolWindowIsNotEmpty() {
+      if (myProject == null) return false;
+      ToolWindowManagerEx m = ToolWindowManagerEx.getInstanceEx(myProject);
+      if (m == null) return false;
+      return !m.getIdsOn(ToolWindowAnchor.TOP).isEmpty();
+    }
+
     @Override
     public boolean isBorderOpaque() {
       return true;