From 2bb682aacf0342067c34f8b1cd824c4e06ed5114 Mon Sep 17 00:00:00 2001 From: anstarovoyt Date: Mon, 4 Jun 2018 21:53:16 +0300 Subject: [PATCH] platform fixes: ignore fixes with html text --- .../codeInsight/daemon/impl/DaemonTooltipActionProvider.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 348086790ef8..c378f0f124dc 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 @@ -11,6 +11,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.ex.TooltipAction import com.intellij.openapi.util.registry.Registry import com.intellij.psi.PsiDocumentManager +import com.intellij.xml.util.XmlStringUtil import java.util.* class DaemonTooltipActionProvider : TooltipActionProvider { @@ -89,7 +90,11 @@ fun extractMostPriorityFix(highlightInfo: HighlightInfo, editor: Editor): Toolti } if (action !is AbstractEmptyIntentionAction && action.isAvailable(project, editor, psiFile)) { - return DaemonTooltipAction(it.text, highlightInfo.actualStartOffset) + val text = it.text + //we cannot properly render html inside the fix button fixes with html text + if (!XmlStringUtil.isWrappedInHtml(text)) { + return DaemonTooltipAction(text, highlightInfo.actualStartOffset) + } } } return null