add tracked offset resolution when outside paragraph or table element

Author: vsch

VERSION-TODO.md

@@ -219,10 +219,12 @@ Please give feedback on the upcoming changes if you have concerns about breaking
 
 ## Next 0.59.92
 
-* [ ] Fix: multi-caret mode caret extraction seems to mess up
-* [ ] Fix: formatter tracking offset adjustment when tracking offset is not in table or
-      paragraph, ie. not resolved after formatting then resolve in Formatter.render when using
-      builder.
+* [ ] Fix: add item/child and first/rest continuation prefix tracking to allow separate prefix
+      style to be used on item paragraph (item) and following child elements (child). The
+      first/rest distinction applies to first line of item with rest being the continuation
+      lines.
+* Fix: formatter tracking offset adjustment when tracking offset is not in table or paragraph,
+  ie. not resolved after formatting then resolve in Formatter.render when using builder.
 * Add: `SpecExampleExtension` formatting for spec test files.
 * Add: `NodeFormatterContext.delegateRender()` method to delegate to format handler registered
   after the current one. If none then will delegate to `Node` renderer, with

flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/FormatterSpecTest.java

@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -47,11 +48,10 @@ public void parse(CharSequence input) {
 
             @Override
             protected @NotNull String renderHtml() {
-                String html = super.renderHtml();
-
                 if (trackedOffsets == null) {
-                    return html;
+                    return getRenderer().render(getDocument());
                 } else {
+                    String html = ((Formatter)getRenderer()).render(getDocument(), getDocument().getDocument().getChars().getBuilder());
                     List<TrackedOffset> trackedOffsetList = Formatter.TRACKED_OFFSETS.get(getDocument().getDocument());
                     assert trackedOffsetList == trackedOffsets;
 

flexmark-core-test/src/test/resources/core_formatter_spec.md

@@ -3456,9 +3456,9 @@ and more text.
 ````````````````````````````````
 
 
-### Tracked Offset
+## Tracked Offset
 
-```````````````````````````````` example(Wrap - Tracked Offset: 1) options(margin[31])
+```````````````````````````````` example(Tracked Offset: 1) options(margin[31])
 * Paragraph with hard break ⦙and more text. [Test](test) text. 
     
 1. Paragraph with soft break and more text. ![Test](test) text. 
@@ -3474,7 +3474,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 2) options(margin[31])
+```````````````````````````````` example(Tracked Offset: 2) options(margin[31])
 * Paragraph with hard break⦙ and more text. [Test](test) text. 
     
 1. Paragraph with soft break and more text. ![Test](test) text. 
@@ -3490,7 +3490,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 3) options(margin[31])
+```````````````````````````````` example(Tracked Offset: 3) options(margin[31])
 * Paragraph with hard break and more text. [Test](test) text. 
     
 1. Paragraph with soft break ⦙and more text. ![Test](test) text. 
@@ -3506,7 +3506,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 4) options(margin[31])
+```````````````````````````````` example(Tracked Offset: 4) options(margin[31])
 * Paragraph with hard break and more text. [Test](test) text. 
     
 1. Paragraph with soft break⦙ and more text. ![Test](test) text. 
@@ -3522,7 +3522,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 5) options(margin[31], explicit-links-at-start)
+```````````````````````````````` example(Tracked Offset: 5) options(margin[31], explicit-links-at-start)
 * Paragraph with hard break and more text.⦙ [Test](test) text. 
     
 1. Paragraph with soft break and more text. ![Test](test) text. 
@@ -3539,7 +3539,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 6) options(margin[31], explicit-links-at-start, image-links-at-start)
+```````````````````````````````` example(Tracked Offset: 6) options(margin[31], explicit-links-at-start, image-links-at-start)
 * Paragraph with hard break and more text.⦙ [Test](test) text. 
     
 1. Paragraph with soft break and more text. ![Test](test) text. 
@@ -3556,7 +3556,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 7) options(margin[31], explicit-links-at-start, image-links-at-start)
+```````````````````````````````` example(Tracked Offset: 7) options(margin[31], explicit-links-at-start, image-links-at-start)
 * Paragraph with hard break and more text. ⦙[Test](test) text. 
     
 1. Paragraph with soft break and more text. ![Test](test) text. 
@@ -3573,7 +3573,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 8) options(margin[31], explicit-links-at-start, image-links-at-start)
+```````````````````````````````` example(Tracked Offset: 8) options(margin[31], explicit-links-at-start, image-links-at-start)
 * Paragraph with hard break and more text. [Test](test) text.⦙ 
     
 1. Paragraph with soft break and more text. ![Test](test) text. 
@@ -3590,7 +3590,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 9) options(margin[31], explicit-links-at-start, image-links-at-start)
+```````````````````````````````` example(Tracked Offset: 9) options(margin[31], explicit-links-at-start, image-links-at-start)
 * Paragraph with hard break and more text. [Test](test) text. 
     
 1. Paragraph with soft break and more text.⦙ ![Test](test) text. 
@@ -3607,7 +3607,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 10) options(margin[31], explicit-links-at-start, image-links-at-start)
+```````````````````````````````` example(Tracked Offset: 10) options(margin[31], explicit-links-at-start, image-links-at-start)
 * Paragraph with hard break and more text. [Test](test) text. 
     
 1. Paragraph with soft break and more text. ⦙![Test](test) text. 
@@ -3624,7 +3624,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 11) options(margin[31], explicit-links-at-start, image-links-at-start)
+```````````````````````````````` example(Tracked Offset: 11) options(margin[31], explicit-links-at-start, image-links-at-start)
 * Paragraph with hard break and more text. [Test](test) text. 
     
 1. Paragraph with soft break and more text. ![Test](test) text.⦙ 
@@ -3641,7 +3641,7 @@ and more text.
 ````````````````````````````````
 
 
-```````````````````````````````` example(Wrap - Tracked Offset: 12) options(margin[31], explicit-links-at-start, image-links-at-start)
+```````````````````````````````` example(Tracked Offset: 12) options(margin[31], explicit-links-at-start, image-links-at-start)
 * Paragraph with hard break and⦙ ⦙more text.⦙ ⦙[Test](test) text.⦙ 
     
 1. Paragraph with soft break⦙ ⦙and more text.⦙ ⦙![Test](test) text.⦙ 
@@ -3658,6 +3658,45 @@ and more text.
 ````````````````````````````````
 
 
+```````````````````````````````` example(Tracked Offset: 13) options(margin[31], explicit-links-at-start, image-links-at-start)
+⦙* Paragraph with hard break and more text. [Test](test) text. 
+    
+.
+⦙* Paragraph with hard break and
+  more text.
+  [Test](test) text.
+
+````````````````````````````````
+
+
+```````````````````````````````` example(Tracked Offset: 14) options(margin[31], explicit-links-at-start, image-links-at-start)
+*⦙ Paragraph with hard break and more text. [Test](test) text. 
+    
+.
+*⦙ Paragraph with hard break and
+  more text.
+  [Test](test) text.
+
+````````````````````````````````
+
+
+```````````````````````````````` example(Tracked Offset: 15) options(margin[31], explicit-links-at-start, image-links-at-start)
+⦙*⦙ ⦙Paragraph with hard break and⦙ ⦙more text.⦙ ⦙[Test](test) text.⦙ 
+    
+⦙1⦙.⦙ ⦙Paragraph with soft break⦙ ⦙and more text.⦙ ⦙![Test](test) text.⦙ 
+                               
+.
+⦙*⦙ ⦙Paragraph with hard break and⦙
+  ⦙more text.⦙
+  ⦙[Test](test) text.⦙
+
+⦙1⦙.⦙ ⦙Paragraph with soft break⦙
+   ⦙and more text.⦙
+   ⦙![Test](test) text.⦙
+
+````````````````````````````````
+
+
 ## Issue
 
 ### 243

flexmark-ext-tables/src/test/resources/ext_tables_formatter_spec.md

@@ -1547,9 +1547,23 @@ fails in md nav
 ````````````````````````````````
 
 
+```````````````````````````````` example(Tracked Offset - Indented: 11) options(left-align-marker-add, NO_FILE_EOL)
+|name⦙|display|title_en|title_de|
+|---|---|---|---|
+|no⦙ne| | | |
+|Prof⦙.|Prof.⦙|Prof.|Prof.|
+.
+| name⦙  | display | title_en | title_de |
+|:------|:--------|:---------|:---------|
+| no⦙ne  |         |          |          |
+| Prof⦙. | Prof.⦙   | Prof.    | Prof.    |
+
+````````````````````````````````
+
+
 in item
 
-```````````````````````````````` example Tracked Offset - Indented: 11
+```````````````````````````````` example Tracked Offset - Indented: 12
 - Add: live templates starting with `.`
 
   | Element       | Abbreviation    | Expansion                                               |

flexmark-util/src/main/java/com/vladsch/flexmark/util/format/MarkdownWriterBase.java

@@ -49,6 +49,8 @@ public M tailBlankLine() {
     public abstract M tailBlankLine(int count);
 
     // @formatter:off
+    @Override public void setLinePrefixIndex(int lineIndex, int prefixEndIndex)                                                                                 { appendable.setLinePrefixIndex(lineIndex, prefixEndIndex); }
+    @Override public void setLinePrefixIndex(int lineIndex, @NotNull CharSequence prefix, @NotNull CharSequence content)                                        { appendable.setLinePrefixIndex(lineIndex, prefix, content); }
     @Override public boolean isPendingSpace()                                                                                                                   { return appendable.isPendingSpace(); }
     @Override public boolean isPreFormatted()                                                                                                                   { return appendable.isPreFormatted(); }
     @Override public boolean isPreFormattedLine(int line)                                                                                                       { return appendable.isPreFormattedLine(line); }
@@ -65,14 +67,13 @@ public M tailBlankLine() {
     @Override public int textOnlyOffset()                                                                                                                       { return appendable.textOnlyOffset(); }
     @Override public int textOnlyOffsetWithPending()                                                                                                            { return appendable.textOnlyOffsetWithPending(); }
     @Override public int getLinePrefixIndex(int lineIndex)                                                                                                      { return appendable.getLinePrefixIndex(lineIndex); }
-    @Override public void setLinePrefixIndex(int lineIndex, int prefixEndIndex)                                                                                 { appendable.setLinePrefixIndex(lineIndex, prefixEndIndex); }
-    @Override public void setLinePrefixIndex(int lineIndex, @NotNull CharSequence prefix, @NotNull CharSequence content)                                        { appendable.setLinePrefixIndex(lineIndex, prefix, content); }
     @NotNull @Override public int[] getLinesPrefixIndex(int startLine, int endLine)                                                                             { return appendable.getLinesPrefixIndex(startLine, endLine); }
     @NotNull @Override public CharSequence[] getLinesPrefix(int startLine, int endLine)                                                                         { return appendable.getLinesPrefix(startLine, endLine); }
     @NotNull @Override public CharSequence[] getLinesContent(int startLine, int endLine)                                                                        { return appendable.getLinesContent(startLine, endLine); }
     @NotNull @Override public CharSequence[] getLines(int startLine, int endLine)                                                                               { return appendable.getLines(startLine, endLine); }
     @Override @NotNull public BitFieldSet<Options> getOptionSet()                                                                                               { return appendable.getOptionSet();}
     @Override public int getAfterEolPrefixDelta()                                                                                                               { return appendable.getAfterEolPrefixDelta(); }
+    @Override @Nullable public SequenceBuilder getBuilder()                                                                                                     { return appendable.getBuilder(); }
     @Override @NotNull public M pushOptions()                                                                                                                   { appendable.pushOptions(); return (M) this;}
     @Override @NotNull public M popOptions()                                                                                                                    { appendable.popOptions(); return (M) this;}
     @Override @NotNull public M changeOptions(int addFlags, int removeFlags)                                                                                    { appendable.changeOptions(addFlags, removeFlags); return (M) this;}

flexmark-util/src/main/java/com/vladsch/flexmark/util/html/HtmlFormattingAppendableBase.java

@@ -414,6 +414,8 @@ public T tagLineIndent(@NotNull CharSequence tagName, @NotNull Runnable runnable
 
     // delegated to LineFormattingAppendable
     // @formatter:off
+    @Override public void setLinePrefixIndex(int lineIndex, int prefixEndIndex)                                                                                 { appendable.setLinePrefixIndex(lineIndex, prefixEndIndex); }
+    @Override public void setLinePrefixIndex(int lineIndex, @NotNull CharSequence prefix, @NotNull CharSequence content)                                        { appendable.setLinePrefixIndex(lineIndex, prefix, content); }
     @Override @NotNull public LineAppendable pushOptions()                                                                                                      { return appendable.pushOptions(); }
     @Override @NotNull public LineAppendable popOptions()                                                                                                       { return appendable.popOptions(); }
     @Override @NotNull public LineAppendable changeOptions(int addFlags, int removeFlags)                                                                       { return appendable.changeOptions(addFlags, removeFlags); }
@@ -433,18 +435,17 @@ public T tagLineIndent(@NotNull CharSequence tagName, @NotNull Runnable runnable
     @Override public int textOnlyOffset()                                                                                                                       { return appendable.textOnlyOffset(); }
     @Override public int textOnlyOffsetWithPending()                                                                                                            { return appendable.textOnlyOffsetWithPending(); }
     @Override public int getLinePrefixIndex(int lineIndex)                                                                                                      { return appendable.getLinePrefixIndex(lineIndex); }
-    @Override public void setLinePrefixIndex(int lineIndex, int prefixEndIndex)                                                                                 { appendable.setLinePrefixIndex(lineIndex, prefixEndIndex); }
-    @Override public void setLinePrefixIndex(int lineIndex, @NotNull CharSequence prefix, @NotNull CharSequence content)                                        { appendable.setLinePrefixIndex(lineIndex, prefix, content); }
     @NotNull @Override public int[] getLinesPrefixIndex(int startLine, int endLine)                                                                             { return appendable.getLinesPrefixIndex(startLine, endLine); }
     @NotNull @Override public CharSequence[] getLinesPrefix(int startLine, int endLine)                                                                         { return appendable.getLinesPrefix(startLine, endLine); }
     @NotNull @Override public CharSequence[] getLinesContent(int startLine, int endLine)                                                                        { return appendable.getLinesContent(startLine, endLine); }
     @NotNull @Override public CharSequence[] getLines(int startLine, int endLine)                                                                               { return appendable.getLines(startLine, endLine); }
     @Override public String toString(int maxBlankLines)                                                                                                         { return appendable.toString(maxBlankLines); }
     @Override @NotNull public BitFieldSet<Options> getOptionSet()                                                                                               { return appendable.getOptionSet();}
+    @Override public int getAfterEolPrefixDelta()                                                                                                               { return appendable.getAfterEolPrefixDelta(); }
+    @Override @Nullable public SequenceBuilder getBuilder()                                                                                                     { return appendable.getBuilder(); }
     @NotNull @Override public T addIndentOnFirstEOL(@NotNull Runnable runnable)                                                                                 { appendable.addIndentOnFirstEOL(runnable);  return (T)this; }
     @NotNull @Override public T addPrefix(@NotNull CharSequence prefix)                                                                                         { appendable.addPrefix(prefix); return (T)this; }
     @NotNull @Override public T addPrefix(@NotNull CharSequence prefix, boolean afterEol)                                                                       { appendable.addPrefix(prefix, afterEol);  return (T)this; }
-    @Override public int getAfterEolPrefixDelta()                                                                                                               { return appendable.getAfterEolPrefixDelta(); }
     @NotNull @Override public T append(char c)                                                                                                                  { appendable.append(c); return (T)this; }
     @NotNull @Override public T append(@NotNull CharSequence csq)                                                                                               { appendable.append(csq); return (T)this; }
     @NotNull @Override public T append(@NotNull CharSequence csq, int start, int end)                                                                           { appendable.append(csq, start, end); return (T)this; }

flexmark-util/src/main/java/com/vladsch/flexmark/util/html/LineAppendable.java

@@ -158,6 +158,13 @@ default LineAppendable setOptions(BitFieldSet<Options> options) {
         return setOptions(options.toInt());
     }
 
+    /**
+     * Get builder used for accumulation or null if none
+     * @return builder used for accumulation or null if none
+     */
+    @Nullable
+    SequenceBuilder getBuilder();
+
     // these methods are monitored for content and formatting applied
     @Override
     @NotNull LineAppendable append(@NotNull CharSequence csq);

flexmark-util/src/main/java/com/vladsch/flexmark/util/html/LineFormattingAppendableImpl.java

@@ -586,6 +586,11 @@ public LineAppendable append(@NotNull CharSequence csq) {
         return this;
     }
 
+    @Override
+    public @Nullable SequenceBuilder getBuilder() {
+        return builder;
+    }
+
     @NotNull
     @Override
     public LineAppendable append(@NotNull CharSequence csq, int start, int end) {