diff --git a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java index d0af4647f924..b3f048e9b835 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java +++ b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java @@ -628,6 +628,9 @@ public class SwingHelper { @NotNull public static @Nls String buildHtml(@NotNull @Nls String headInnerHtml, @NotNull @Nls String bodyInnerHtml) { + if (bodyInnerHtml.contains("")) { + bodyInnerHtml = UIUtil.getHtmlBody(bodyInnerHtml); + } return HtmlChunk.html().children( HtmlChunk.head().addRaw(headInnerHtml), HtmlChunk.body().addRaw(bodyInnerHtml) @@ -746,23 +749,23 @@ public class SwingHelper { } } - public static JEditorPane createHtmlLabel(@NotNull @Nls final String innerHtml, @Nullable @Nls String disabledHtml, - @Nullable final Consumer hyperlinkListener) { - disabledHtml = disabledHtml == null ? innerHtml : disabledHtml; + public static @NotNull JEditorPane createHtmlLabel(@NotNull @Nls String bodyInnerHtml, + @Nullable @Nls String disabledBodyInnerHtml, + @Nullable Consumer hyperlinkListener) { final Font font = UIUtil.getLabelFont(); String html = buildHtml( UIUtil.getCssFontDeclaration(font, UIUtil.getActiveTextColor(), null, null), - innerHtml + bodyInnerHtml ); - String disabled = buildHtml( + String disabledHtml = buildHtml( UIUtil.getCssFontDeclaration(font, UIUtil.getInactiveTextColor(), null, null), - disabledHtml + ObjectUtils.notNull(disabledBodyInnerHtml, bodyInnerHtml) ); final JEditorPane pane = new SwingHelper.HtmlViewerBuilder() .setCarryTextOver(false) .setFont(UIUtil.getLabelFont()) - .setDisabledHtml(disabled) + .setDisabledHtml(disabledHtml) .create(); pane.setText(html); pane.addHyperlinkListener(