From 8a08eb919e82b8e18723e5069a6d1d74ad3c9316 Mon Sep 17 00:00:00 2001 From: anstarovoyt Date: Sat, 9 Jun 2018 12:59:53 +0300 Subject: [PATCH] platform: show / hide buttons is a part of the renderer --- .../codeInsight/daemon/impl/DaemonTooltipActionProvider.kt | 2 +- .../daemon/impl/DaemonTooltipWithActionRenderer.kt | 4 +++- .../daemon/impl/tooltips/TooltipActionProvider.java | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipActionProvider.kt b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipActionProvider.kt index c378f0f124dc..5f6340eab375 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipActionProvider.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipActionProvider.kt @@ -23,7 +23,7 @@ class DaemonTooltipActionProvider : TooltipActionProvider { } class DaemonTooltipAction(private val myFixText: String, private val myActualOffset: Int) : TooltipAction { - + override fun getText(): String { return myFixText } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipWithActionRenderer.kt b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipWithActionRenderer.kt index 9c03e29cb719..5adea70734c7 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipWithActionRenderer.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipWithActionRenderer.kt @@ -104,7 +104,9 @@ internal class DaemonTooltipWithActionRenderer(text: String?, JBUI.insets(3, 3, 0, 3), 0, 0) grid.add(settingsComponent, settingsConstraints) - addActionsRow(hintHint, hint, editor, actions, grid) + if (isShowActions()) { + addActionsRow(hintHint, hint, editor, actions, grid) + } } private fun addActionsRow(hintHint: HintHint, diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java index 7bccba209818..379493dc569b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java @@ -27,8 +27,6 @@ public interface TooltipActionProvider { @Nullable static TooltipAction calcTooltipAction(@NotNull final HighlightInfo info, @NotNull Editor editor) { - if (!isShowActions()) return null; - for (TooltipActionProvider extension : EXTENSION_POINT_NAME.getExtensions()) { TooltipAction action = extension.getTooltipAction(info, editor); if (action != null) return action;