Fix rendering empty tables

asciidoctor · Oct 20, 2024 · 8459943 · 8459943
1 parent b19a53a
commit 8459943
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/...module/src/main/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessor.java b/...module/src/main/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessor.java
@@ -44,7 +44,13 @@ public void process(StructuralNode node) {
         final Sink sink = getSink();
         sink.table();
         sink.tableRows(new int[]{JUSTIFY_LEFT}, false);
-        List<Row> header = tableNode.getHeader();
+        final List<Row> header = tableNode.getHeader();
+        final List<Row> rows = tableNode.getBody();
+
+        if (header.isEmpty() && rows.isEmpty()) {
+            return;
+        }
+
         if (!header.isEmpty()) {
             sink.tableRow();
 
@@ -58,7 +64,7 @@ public void process(StructuralNode node) {
             sink.tableRow_();
         }
 
-        for (Row row : tableNode.getBody()) {
+        for (Row row : rows) {
             sink.tableRow();
             for (Cell cell : row.getCells()) {
                 sink.tableCell();

diff --git a/...r-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/NodeSinkerTest.java b/...r-parser-doxia-module/src/test/java/org/asciidoctor/maven/site/parser/NodeSinkerTest.java
@@ -5,9 +5,12 @@
 
 import org.apache.maven.doxia.sink.Sink;
 import org.asciidoctor.ast.Block;
+import org.asciidoctor.ast.Cell;
 import org.asciidoctor.ast.Document;
 import org.asciidoctor.ast.ListItem;
+import org.asciidoctor.ast.Row;
 import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.ast.Table;
 import org.asciidoctor.jruby.ast.impl.BlockImpl;
 import org.asciidoctor.jruby.ast.impl.DocumentImpl;
 import org.asciidoctor.jruby.ast.impl.SectionImpl;
@@ -105,6 +108,11 @@ void should_process_section_node() {
     @Test
     void should_process_table_node() {
         StructuralNode mockNode = mockNode("table", TableImpl.class);
+        Cell mockCell = Mockito.mock(Cell.class);
+        Mockito.when(mockCell.getText()).thenReturn("Cell text");
+        Row mockRow = Mockito.mock(Row.class);
+        Mockito.when(mockRow.getCells()).thenReturn(List.of(mockCell));
+        Mockito.when(((Table) mockNode).getBody()).thenReturn(List.of(mockRow));
 
         nodeSinker.sink(mockNode);
 

diff --git a/...le/src/test/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessorTest.java b/...le/src/test/java/org/asciidoctor/maven/site/parser/processors/TableNodeProcessorTest.java
@@ -35,6 +35,22 @@ class TableNodeProcessorTest {
     private NodeProcessor nodeProcessor;
     private StringWriter sinkWriter;
 
+    @Test
+    void should_convert_empty_table() {
+        String content = "= Document tile\n" +
+            "\n" +
+            "\n" +
+            "== Section\n" +
+            "|===\n" +
+            "|===";
+
+        String html = process(content);
+
+        // Header for now is just first row with class=a
+        assertThat(html)
+            .isEmpty();
+    }
+
     @Test
     void should_convert_table_with_header() {
         String content = documentWithTable(true, noCaption, emptyList());