Adapt parsing PlantUML code blocks to that of fenced code blocks

Do no longer parse the line break characters after @enduml as part of the code block,
similar to parsing fenced code blocks.

Author: travkin79

flexmark-ext-plantuml/src/main/java/com/vladsch/flexmark/ext/plantuml/PlantUmlBlockNode.java

@@ -29,8 +29,8 @@
  */
 public class PlantUmlBlockNode extends CodeBlock {
 
-    private BasedSequence startMarker;
-    private BasedSequence endMarker;
+    private BasedSequence startMarker = BasedSequence.NULL;
+    private BasedSequence endMarker = BasedSequence.NULL;
 
     public PlantUmlBlockNode() {
     }
@@ -46,6 +46,12 @@ public PlantUmlBlockNode(BasedSequence chars, List<BasedSequence> lineSegments)
     public PlantUmlBlockNode(List<BasedSequence> lineSegments) {
         this(getSpanningChars(lineSegments), lineSegments);
     }
+    
+    @NotNull
+    @Override
+    public BasedSequence[] getSegments() {
+        return new BasedSequence[] { startMarker, getContentChars(), endMarker };
+    }
 
     private static @NotNull BasedSequence getSpanningChars(@NotNull List<BasedSequence> lineSegments) {
         return lineSegments.isEmpty() ? BasedSequence.NULL : lineSegments.get(0).baseSubSequence(

flexmark-ext-plantuml/src/main/java/com/vladsch/flexmark/ext/plantuml/internal/PlantUmlCodeBlockParser.java

@@ -14,6 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.Set;
 
 public class PlantUmlCodeBlockParser extends AbstractBlockParser {
@@ -50,7 +51,7 @@ public BlockContinue tryContinue(ParserState state) {
             if (blockData != null) {
                 this.blockNode.setEndMarker(blockData.endMarker);
                 this.blockData.finished = true;
-                return BlockContinue.atIndex(state.getIndex());
+                return BlockContinue.finished();
             } else {
                 // this case should never happen since we made a look-ahead before
                 this.blockNode.unlink();
@@ -79,7 +80,10 @@ public void closeBlock(ParserState state) {
 
             if (start != null && end != null
                     && start.length() > 1 && end.length() > 1) {
-                blockNode.setChars(this.blockData.contents);
+                // Remove first line break from the contents, i.e. after @startuml
+                List<BasedSequence> lines = this.blockData.contents.splitListEOL();
+                blockNode.setContent(lines.subList(1, lines.size()));
+                blockNode.setCharsFromContent();
             }
         }
     }
@@ -133,8 +137,9 @@ public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockPar
                 for (BasedSequence currentLine : remainingLines) {
                     BlockData result = tryReadingEndMarker(currentLine, blockData);
                     if (result != null) {
+                        // go on reading code block in the next line, i.e. first line after e.g. @startuml
                         return BlockStart.of(new PlantUmlCodeBlockParser(blockData))
-                                .atColumn(state.getColumn());
+                                .atColumn(state.getLineEndIndex());
                     }
                 }
             }
@@ -149,8 +154,7 @@ private static BlockData tryReadingStartMarker(BasedSequence currentLine) {
             if (currentLine.startsWith(marker.getStart())) {
                 BasedSequence remainder = currentLine.subSequence(marker.getStart().length());
                 if (remainder.isBlank()) {
-                    return new BlockData(marker, currentLine.getStartOffset(),
-                            currentLine.subSequence(0, marker.getStart().length()));
+                    return new BlockData(marker, currentLine.subSequence(0, marker.getStart().length()));
                 }
             }
         }
@@ -161,7 +165,6 @@ private static BlockData tryReadingEndMarker(BasedSequence currentLine, BlockDat
         if (currentLine.startsWith(blockData.marker.getEnd())) {
             BasedSequence remainder = currentLine.subSequence(blockData.marker.getEnd().length());
             if (remainder.isBlank()) {
-                blockData.endOffset = currentLine.getEndOffset();
                 blockData.endMarker = currentLine.subSequence(0, blockData.marker.getEnd().length());
                 return blockData;
             }
@@ -171,17 +174,14 @@ private static BlockData tryReadingEndMarker(BasedSequence currentLine, BlockDat
 
     private static class BlockData {
         final PlantUmlBlockMarker marker;
-        int startOffset;
-        int endOffset;
         BasedSequence startMarker;
         BasedSequence endMarker;
         BasedSequence contents;
 
         boolean finished = false;
 
-        BlockData(PlantUmlBlockMarker marker, int startOffset, BasedSequence startMarker) {
+        BlockData(PlantUmlBlockMarker marker, BasedSequence startMarker) {
             this.marker = marker;
-            this.startOffset = startOffset;
             this.startMarker = startMarker;
         }
     }

flexmark-ext-plantuml/src/test/resources/ext_plantuml_ast_spec.md

@@ -152,7 +152,7 @@ Document[0, 143]
     Text[11, 20] chars:[11, 20, "Some text"]
     SoftLineBreak[20, 21]
     Text[21, 36] chars:[21, 36, "in a  … raph."]
-  PlantUmlBlockNode[38, 124]
+  PlantUmlBlockNode[38, 123]
   Paragraph[125, 143]
     Text[125, 143] chars:[125, 143, "Anoth … raph."]
 ````````````````````````````````