Add Asciidoctor Tabs CSS also for Antora themed pages (#1425)

asciidoctor · Sep 24, 2023 · 5284136 · 5284136
1 parent c244fda
commit 5284136
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -7,6 +7,10 @@ This document provides a high-level view of the changes introduced by release.
 [[releasenotes]]
 == Release notes
 
+=== 0.40.3
+
+- Add Asciidoctor Tabs CSS also for Antora themed pages (#1425)
+
 === 0.40.2
 
 - Expanding or collapsing a section will not scroll the editor or open the included file (#1436)

diff --git a/src/main/java/org/asciidoc/intellij/editor/browser/BrowserPanel.java b/src/main/java/org/asciidoc/intellij/editor/browser/BrowserPanel.java
@@ -80,6 +80,7 @@ public class BrowserPanel implements Disposable {
 
   @Nullable
   private String myInlineCss;
+  private String myTabsCss;
   @Nullable
   private String myInlineCssDarcula;
   @Nullable
@@ -127,7 +128,8 @@ public BrowserPanel() {
         myInlineCss += IOUtils.toString(is, StandardCharsets.UTF_8);
       }
       try (InputStream is = JavaFxHtmlPanel.class.getResourceAsStream("/asciidoctor/tabs/tabs.css")) {
-        myInlineCss = myInlineCss + IOUtils.toString(is, StandardCharsets.UTF_8);
+        myTabsCss = IOUtils.toString(is, StandardCharsets.UTF_8);
+        myInlineCss = myInlineCss + myTabsCss;
       }
       try (InputStream is = JavaFxHtmlPanel.class.getResourceAsStream("darcula.css")) {
         myInlineCssDarcula = myInlineCss + IOUtils.toString(is, StandardCharsets.UTF_8);
@@ -404,7 +406,7 @@ private String prepareHtml(@NotNull String html, Project project, Map<String, St
 
     /* Add CSS line and JavaScript */
     if (isAntora) {
-      html = AsciiDocWrapper.enrichPage(html, (isDarcula() ? myAntoraDarculaCssLink : myAntoraCssLink) + myFontAwesomeCssLink, myMermaidScript, myAsciidoctorTabsScript, attributes, project);
+      html = AsciiDocWrapper.enrichPage(html, (isDarcula() ? myAntoraDarculaCssLink : myAntoraCssLink) + myFontAwesomeCssLink + getCssLines(myTabsCss), myMermaidScript, myAsciidoctorTabsScript, attributes, project);
     } else {
       html = AsciiDocWrapper.enrichPage(html, getCssLines(isDarcula() ? myInlineCssDarcula : myInlineCss) + myFontAwesomeCssLink + myGoogleFontsCssLink + myDroidSansMonoCssLink + myDejavuCssLink, myMermaidScript, myAsciidoctorTabsScript, attributes, project);
     }

diff --git a/src/main/java/org/asciidoc/intellij/editor/jcef/AsciiDocJCEFHtmlPanel.java b/src/main/java/org/asciidoc/intellij/editor/jcef/AsciiDocJCEFHtmlPanel.java
@@ -242,7 +242,8 @@ public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) {
         myInlineCss += IOUtils.toString(is, StandardCharsets.UTF_8);
       }
       try (InputStream is = JavaFxHtmlPanel.class.getResourceAsStream("/asciidoctor/tabs/tabs.css")) {
-        myInlineCss = myInlineCss + IOUtils.toString(is, StandardCharsets.UTF_8);
+        myTabsCss = IOUtils.toString(is, StandardCharsets.UTF_8);
+        myInlineCss = myInlineCss + myTabsCss;
       }
       try (InputStream is = JavaFxHtmlPanel.class.getResourceAsStream("darcula.css")) {
         myInlineCssDarcula = myInlineCss + IOUtils.toString(is, StandardCharsets.UTF_8);
@@ -552,6 +553,8 @@ private String extractAndPatchAsciidoctorCss(String asciidoctorVersion) throws I
   @Nullable
   private String myInlineCss;
   @Nullable
+  private String myTabsCss;
+  @Nullable
   private String myInlineCssDarcula;
   @Nullable
   private String myFontAwesomeCssLink;
@@ -566,7 +569,6 @@ private String extractAndPatchAsciidoctorCss(String asciidoctorVersion) throws I
 
   @Nullable
   private String myMermaidScript;
-
   @Nullable
   private String myAsciidoctorTabsScript;
 
@@ -830,7 +832,7 @@ private String prepareHtml(@NotNull String html, @NotNull Map<String, String> at
     }
 
     if (isAntora) {
-      html = AsciiDocWrapper.enrichPage(html, (isDarcula() ? myAntoraDarculaCssLink : myAntoraCssLink) + myFontAwesomeCssLink, myMermaidScript, myAsciidoctorTabsScript, attributes, editor != null ? editor.getProject() : null);
+      html = AsciiDocWrapper.enrichPage(html, (isDarcula() ? myAntoraDarculaCssLink : myAntoraCssLink) + myFontAwesomeCssLink + AsciiDocHtmlPanel.getCssLines(myTabsCss), myMermaidScript, myAsciidoctorTabsScript, attributes, editor != null ? editor.getProject() : null);
     } else {
       html = AsciiDocWrapper.enrichPage(html, AsciiDocHtmlPanel.getCssLines(isDarcula() ? myInlineCssDarcula : myInlineCss) + myFontAwesomeCssLink + myGoogleFontsCssLink + myDejavuCssLink, myMermaidScript, myAsciidoctorTabsScript, attributes, editor != null ? editor.getProject() : null);
     }

diff --git a/...ta/inspections/antoraModuleResolve/modules/ROOT/pages/moduleDoesNotResolve.adoc b/...ta/inspections/antoraModuleResolve/modules/ROOT/pages/moduleDoesNotResolve.adoc
@@ -4,3 +4,22 @@ xref:<error descr="Antora Module doesn't resolve">nocomponent:nomodule</error>:p
 
 image::<error descr="Antora Module doesn't resolve">nocomponent:nomodule</error>:image.png[]
 
+
+
+[tabs]
+====
+Tab A:: Contents of Tab A.ddddddddddddddd
+dddddddd
+
+Tab B::
++
+Contents of Tab B.
+
+Tab C::
++
+--
+Contents of Tab C.
+
+Contains more than one block.
+--
+====