From 09078b7778b042e4795efdc7079c852f4c034f48 Mon Sep 17 00:00:00 2001
From: "Vassiliy.Kudryashov" <Vassiliy.Kudryashov@jetbrains.com>
Date: Mon, 17 Jul 2017 16:34:27 +0300
Subject: [PATCH] Code Lens doesn't work in Darcula (after-review)

---
 .../openapi/editor/impl/EditorMarkupModelImpl.java    |  3 +--
 .../src/com/intellij/ui/BalloonImpl.java              |  6 ++++++
 .../intellij/ui/popup/BalloonPopupBuilderImpl.java    | 11 +++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
index 79f751c7df9d..a0867ce0e172 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
@@ -46,7 +46,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.ui.*;
 import com.intellij.ui.awt.RelativePoint;
-import com.intellij.ui.popup.BalloonPopupBuilderImpl;
 import com.intellij.util.Alarm;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.ButtonlessScrollBarUI;
@@ -1343,7 +1342,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
             }
           }
         };
-        editorFragmentPreviewPanel.putClientProperty(BalloonPopupBuilderImpl.FORCED_NO_SHADOW, Boolean.TRUE);
+        editorFragmentPreviewPanel.putClientProperty(BalloonImpl.FORCED_NO_SHADOW, Boolean.TRUE);
         myEditorPreviewHint = new LightweightHint(editorFragmentPreviewPanel) {
 
           @Override
diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
index 08b990b8e35d..3be601a29a07 100644
--- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
@@ -68,6 +68,12 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 public class BalloonImpl implements Balloon, IdeTooltip.Ui {
+  /**
+   * This key is supposed to be used as client property of content component (with value Boolean.TRUE) to suppress shadow painting
+   * when builder is being created indirectly and client cannot call its methods
+   */
+  public static final Key<Boolean> FORCED_NO_SHADOW = Key.create("BALLOON_FORCED_NO_SHADOW");
+
   public static final int DIALOG_ARC = 6;
   public static final int ARC = 3;
   public static final int DIALOG_TOPBOTTOM_POINTER_WIDTH = 24;
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java
index 3ff0465d4e96..0a0a33feb388 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java
@@ -26,7 +26,6 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.ui.BalloonImpl;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -38,12 +37,6 @@ import java.util.List;
 import java.util.Map;
 
 public class BalloonPopupBuilderImpl implements BalloonBuilder {
-  /**
-   * This key is supposed to be used as client property of content component (with value Boolean.TRUE) to suppress shadow painting
-   * when builder is being created indirectly and client cannot call its methods
-   */
-  @NonNls public static final String FORCED_NO_SHADOW = "FORCED_NO_SHADOW";
-
   @Nullable private final Map<Disposable, List<Balloon>> myStorage;
   @Nullable private Disposable myAnchor;
 
@@ -85,7 +78,9 @@ public class BalloonPopupBuilderImpl implements BalloonBuilder {
   public BalloonPopupBuilderImpl(@Nullable Map<Disposable, List<Balloon>> storage, @NotNull final JComponent content) {
     myStorage = storage;
     myContent = content;
-    if (Boolean.TRUE.equals(myContent.getClientProperty(FORCED_NO_SHADOW))) myShadow = false;
+    if (UIUtil.isClientPropertyTrue(myContent, BalloonImpl.FORCED_NO_SHADOW)) {
+      myShadow = false;
+    }
   }
 
   @NotNull