Skip to content

Commit 2c9e579

Browse files
vschvsch
committed
add nullability annotations
1 parent b4dede0 commit 2c9e579

20 files changed

Lines changed: 312 additions & 289 deletions

File tree

‎.idea/codeStyles/Project.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VERSION-TODO.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- [Release 0.60.0](#release-0600)
88
- [API Refactoring](#api-refactoring)
99
- [Next 0.61.xx](#next-061xx)
10+
- [Next 0.61.12](#next-06112)
1011
- [0.61.10](#06110)
1112
- [0.61.8](#0618)
1213
- [0.61.6](#0616)
@@ -217,6 +218,16 @@ Please give feedback on the upcoming changes if you have concerns about breaking
217218
* [ ] Fix: Html converter to not add spaces between end of inline marker and next punctuation:
218219
`.,:;`
219220

221+
## Next 0.61.12
222+
223+
* Fix: update docx4j to 8.1.6
224+
* Fix: docx rendering tests for full spec example
225+
* Add: `JekyllTagExtension.EMBED_INCLUDED_CONTENT`, default `false`. Set to `true` to embed
226+
included markdown content.
227+
* Fix: tracked paragraph wrapping when inserting space before EOL on a line when the word before
228+
caret will be wrapped to the next line. ie. the EOL will be removed.
229+
* Deprecate: `JekyllTagExtension.ENABLE_RENDERING`, not used nor needed.
230+
220231
## 0.61.10
221232

222233
* Add: `HtmlRenderer.FENCED_CODE_LANGUAGE_DELIMITERS`, default `" \t"`, to configure which chars

‎VERSION.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,11 @@ Please give feedback on the upcoming changes if you have concerns about breaking
166166

167167
* Fix: update docx4j to 8.1.6
168168
* Fix: docx rendering tests for full spec example
169-
* Add: `JekyllTagExtension.EMBED_INCLUDED_CONTENT`, default `true`. Set to `false` to prevent
170-
included content from being included.
169+
* Add: `JekyllTagExtension.EMBED_INCLUDED_CONTENT`, default `false`. Set to `true` to embed
170+
included markdown content.
171+
* Fix: tracked paragraph wrapping when inserting space before EOL on a line when the word before
172+
caret will be wrapped to the next line. ie. the EOL will be removed.
173+
* Deprecate: `JekyllTagExtension.ENABLE_RENDERING`, not used nor needed.
171174

172175
## 0.61.10
173176

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.vladsch.flexmark.util.data.DataKey;
1818
import com.vladsch.flexmark.util.data.MutableDataHolder;
1919
import com.vladsch.flexmark.util.data.ScopedDataSet;
20-
import com.vladsch.flexmark.util.dependency.FlatDependencyHandler;
20+
import com.vladsch.flexmark.util.dependency.DependencyResolver;
2121
import com.vladsch.flexmark.util.html.Attributes;
2222
import com.vladsch.flexmark.util.misc.Extension;
2323
import com.vladsch.flexmark.util.sequence.Escaping;
@@ -165,8 +165,8 @@ public class DocxRenderer implements IRender {
165165
// Add as last. This means clients can override the rendering of core nodes if they want.
166166
this.nodeFormatterFactories.add(CoreNodeDocxRenderer::new);
167167

168-
this.attributeProviderFactories = FlatDependencyHandler.computeDependencies(builder.attributeProviderFactories);
169-
this.linkResolverFactories = FlatDependencyHandler.computeDependencies(builder.linkResolverFactories);
168+
this.attributeProviderFactories = DependencyResolver.resolveFlatDependencies(builder.attributeProviderFactories, null, null);
169+
this.linkResolverFactories = DependencyResolver.resolveFlatDependencies(builder.linkResolverFactories, null, null);
170170
}
171171

172172
@Nullable

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.vladsch.flexmark.util.ast.TextContainer;
66
import com.vladsch.flexmark.util.format.ColumnSort;
77
import com.vladsch.flexmark.util.format.MarkdownTable;
8+
import com.vladsch.flexmark.util.format.TrackedOffset;
89
import com.vladsch.flexmark.util.sequence.BasedSequence;
910
import org.junit.Test;
1011

@@ -802,7 +803,7 @@ public void test_trackingOffset1() {
802803
CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
803804
BasedSequence source = BasedSequence.of(charSequence);
804805
MarkdownTable table = getTable(source, formatOptionsAsIs("", null));
805-
assertTrue(table.addTrackedOffset(pos));
806+
assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
806807
HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
807808
MarkdownTable sorted = table.sorted(new ColumnSort[] { ColumnSort.columnSort(1, false, false, false) }, 0, null);
808809
sorted.appendTable(out);

‎flexmark-ext-tables/src/test/java/com/vladsch/flexmark/ext/tables/MarkdownTableTest.java‎

Lines changed: 63 additions & 62 deletions
Large diffs are not rendered by default.

‎flexmark-ext-tables/src/test/java/com/vladsch/flexmark/ext/tables/MarkdownTransposeTableTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.vladsch.flexmark.formatter.MarkdownWriter;
44
import com.vladsch.flexmark.html.HtmlWriter;
55
import com.vladsch.flexmark.util.format.MarkdownTable;
6+
import com.vladsch.flexmark.util.format.TrackedOffset;
67
import com.vladsch.flexmark.util.sequence.BasedSequence;
78
import org.junit.Test;
89

@@ -264,7 +265,7 @@ public void test_trackingOffset1() {
264265
CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
265266
BasedSequence source = BasedSequence.of(charSequence);
266267
MarkdownTable table = getTable(source, formatOptions("", null));
267-
assertTrue(table.addTrackedOffset(pos));
268+
assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
268269
HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
269270
MarkdownTable transposed = table.transposed(1);
270271
transposed.appendTable(out);
@@ -307,7 +308,7 @@ public void test_trackingOffset2() {
307308
CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
308309
BasedSequence source = BasedSequence.of(charSequence);
309310
MarkdownTable table = getTable(source, formatOptions("", null));
310-
assertTrue(table.addTrackedOffset(pos));
311+
assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
311312
HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
312313
MarkdownTable transposed = table.transposed(1);
313314
transposed.appendTable(out);
@@ -350,7 +351,7 @@ public void test_trackingOffset3() {
350351
CharSequence charSequence = markdown.substring(0, pos) + markdown.substring(pos + 1);
351352
BasedSequence source = BasedSequence.of(charSequence);
352353
MarkdownTable table = getTable(source, formatOptions("", null));
353-
assertTrue(table.addTrackedOffset(pos));
354+
assertTrue(table.addTrackedOffset(TrackedOffset.track(pos, null, false)));
354355
HtmlWriter out = new HtmlWriter(0, HtmlWriter.F_FORMAT_ALL);
355356
MarkdownTable transposed = table.transposed(1);
356357
transposed.appendTable(out);

0 commit comments

Comments
 (0)