add nullability annotations

Author: vsch

.idea/codeStyles/Project.xml

@@ -7,6 +7,7 @@
 - [Release 0.60.0](#release-0600)
   - [API Refactoring](#api-refactoring)
 - [Next 0.61.xx](#next-061xx)
+- [Next 0.61.12](#next-06112)
 - [0.61.10](#06110)
 - [0.61.8](#0618)
 - [0.61.6](#0616)
@@ -217,6 +218,16 @@ Please give feedback on the upcoming changes if you have concerns about breaking
 * [ ] Fix: Html converter to not add spaces between end of inline marker and next punctuation:
       `.,:;`
 
+## Next 0.61.12
+
+* Fix: update docx4j to 8.1.6
+* Fix: docx rendering tests for full spec example
+* Add: `JekyllTagExtension.EMBED_INCLUDED_CONTENT`, default `false`. Set to `true` to embed
+  included markdown content.
+* Fix: tracked paragraph wrapping when inserting space before EOL on a line when the word before
+  caret will be wrapped to the next line. ie. the EOL will be removed. 
+* Deprecate: `JekyllTagExtension.ENABLE_RENDERING`, not used nor needed.
+
 ## 0.61.10
 
 * Add: `HtmlRenderer.FENCED_CODE_LANGUAGE_DELIMITERS`, default `" \t"`, to configure which chars

VERSION-TODO.md

@@ -166,8 +166,11 @@ Please give feedback on the upcoming changes if you have concerns about breaking
 
 * Fix: update docx4j to 8.1.6
 * Fix: docx rendering tests for full spec example
-* Add: `JekyllTagExtension.EMBED_INCLUDED_CONTENT`, default `true`. Set to `false` to prevent
-  included content from being included.
+* Add: `JekyllTagExtension.EMBED_INCLUDED_CONTENT`, default `false`. Set to `true` to embed
+  included markdown content.
+* Fix: tracked paragraph wrapping when inserting space before EOL on a line when the word before
+  caret will be wrapped to the next line. ie. the EOL will be removed. 
+* Deprecate: `JekyllTagExtension.ENABLE_RENDERING`, not used nor needed.
 
 ## 0.61.10
 

VERSION.md

@@ -17,7 +17,7 @@
 import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import com.vladsch.flexmark.util.data.ScopedDataSet;
-import com.vladsch.flexmark.util.dependency.FlatDependencyHandler;
+import com.vladsch.flexmark.util.dependency.DependencyResolver;
 import com.vladsch.flexmark.util.html.Attributes;
 import com.vladsch.flexmark.util.misc.Extension;
 import com.vladsch.flexmark.util.sequence.Escaping;
@@ -165,8 +165,8 @@ public class DocxRenderer implements IRender {
         // Add as last. This means clients can override the rendering of core nodes if they want.
         this.nodeFormatterFactories.add(CoreNodeDocxRenderer::new);
 
-        this.attributeProviderFactories = FlatDependencyHandler.computeDependencies(builder.attributeProviderFactories);
-        this.linkResolverFactories = FlatDependencyHandler.computeDependencies(builder.linkResolverFactories);
+        this.attributeProviderFactories = DependencyResolver.resolveFlatDependencies(builder.attributeProviderFactories, null, null);
+        this.linkResolverFactories = DependencyResolver.resolveFlatDependencies(builder.linkResolverFactories, null, null);
     }
 
     @Nullable

flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/DocxRenderer.java

@@ -5,6 +5,7 @@
 import com.vladsch.flexmark.util.ast.TextContainer;
 import com.vladsch.flexmark.util.format.ColumnSort;
 import com.vladsch.flexmark.util.format.MarkdownTable;
+import com.vladsch.flexmark.util.format.TrackedOffset;
 import com.vladsch.flexmark.util.sequence.BasedSequence;
 import org.junit.Test;
 
@@ -802,7 +803,7 @@ public void test_trackingOffset1() {
         CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
         BasedSequence source = BasedSequence.of(charSequence);
         MarkdownTable table = getTable(source, formatOptionsAsIs("", null));
-        assertTrue(table.addTrackedOffset(pos));
+        assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
         HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
         MarkdownTable sorted = table.sorted(new ColumnSort[] { ColumnSort.columnSort(1, false, false, false) }, 0, null);
         sorted.appendTable(out);

flexmark-ext-tables/src/test/java/com/vladsch/flexmark/ext/tables/MarkdownSortTableTest.java

@@ -3,6 +3,7 @@
 import com.vladsch.flexmark.formatter.MarkdownWriter;
 import com.vladsch.flexmark.html.HtmlWriter;
 import com.vladsch.flexmark.util.format.MarkdownTable;
+import com.vladsch.flexmark.util.format.TrackedOffset;
 import com.vladsch.flexmark.util.sequence.BasedSequence;
 import org.junit.Test;
 
@@ -264,7 +265,7 @@ public void test_trackingOffset1() {
         CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
         BasedSequence source = BasedSequence.of(charSequence);
         MarkdownTable table = getTable(source, formatOptions("", null));
-        assertTrue(table.addTrackedOffset(pos));
+        assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
         HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
         MarkdownTable transposed = table.transposed(1);
         transposed.appendTable(out);
@@ -307,7 +308,7 @@ public void test_trackingOffset2() {
         CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
         BasedSequence source = BasedSequence.of(charSequence);
         MarkdownTable table = getTable(source, formatOptions("", null));
-        assertTrue(table.addTrackedOffset(pos));
+        assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
         HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
         MarkdownTable transposed = table.transposed(1);
         transposed.appendTable(out);
@@ -350,7 +351,7 @@ public void test_trackingOffset3() {
         CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
         BasedSequence source = BasedSequence.of(charSequence);
         MarkdownTable table = getTable(source, formatOptions("", null));
-        assertTrue(table.addTrackedOffset(pos));
+        assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
         HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
         MarkdownTable transposed = table.transposed(1);
         transposed.appendTable(out);