Skip to content

Commit 3103d3f

Browse files
committed
add key aggregators
1 parent 733ffd4 commit 3103d3f

File tree

54 files changed

+490
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+490
-188
lines changed

.idea/runConfigurations/AttributeTest.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.

.idea/runConfigurations/AttributesTest.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.

.idea/runConfigurations/ComboCoreTranslationFormatterSpecTest.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.

.idea/runConfigurations/CoreFormatterTestSuite.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.

.idea/runConfigurations/FlexmarkFormatterTestSuite.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.

.idea/runConfigurations/MutableAttributeTest.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.

.idea/runConfigurations/RepeatedCharSequenceTest.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.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ flexmark-java
99
- [Next 0.60.0](#next-0600)
1010
- [API Changes](#api-changes)
1111
- [Next 0.59.21](#next-05921)
12+
- [0.59.21](#05921)
1213
- [0.59.19](#05919)
1314
- [0.59.17](#05917)
1415
- [0.59.15](#05915)
@@ -156,6 +157,17 @@ Next 0.59.21
156157
spec test and not requiring deep inheritance dependencies. Merge full test spec and
157158
individual tests. for example see MdNav `LightPlatformCodeInsightSpecTestCase`
158159

160+
0.59.21
161+
-------
162+
163+
* Fix: move flexmark modules test classes out of `test.util` package which is for
164+
`flexmark-test-util` module's test classes
165+
* Add: `DataSet.registerDataKeyAggregator(DataKeyAggregator)` to allow for aggregation action
166+
keys and aggregation for combining keys which require this. Only applied in
167+
* `DataSet.aggregate()`
168+
* `DataSet.aggregate(DataHolder, DataHolder)`
169+
* `DataSet.aggregateActions(DataHolder, DataHolder)`
170+
159171
0.59.19
160172
-------
161173

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.vladsch.flexmark.test.util.FlexmarkSpecExampleRenderer;
77
import com.vladsch.flexmark.test.util.SpecExampleRenderer;
88
import com.vladsch.flexmark.util.data.DataHolder;
9+
import com.vladsch.flexmark.util.data.DataSet;
910
import org.jetbrains.annotations.NotNull;
1011
import org.jetbrains.annotations.Nullable;
1112

@@ -18,7 +19,7 @@ public FormatterSpecTest(@NotNull SpecExample example, @Nullable Map<String, Dat
1819

1920
@Override
2021
final public @NotNull SpecExampleRenderer getSpecExampleRenderer(@NotNull SpecExample example, @Nullable DataHolder exampleOptions) {
21-
DataHolder combinedOptions = combineOptions(myDefaultOptions, exampleOptions);
22+
DataHolder combinedOptions = aggregate(myDefaultOptions, exampleOptions);
2223
return new FlexmarkSpecExampleRenderer(example, combinedOptions, Parser.builder(combinedOptions).build(), Formatter.builder(combinedOptions).build(), true);
2324
}
2425
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.vladsch.flexmark.test.util.FlexmarkSpecExampleRenderer;
88
import com.vladsch.flexmark.test.util.SpecExampleRenderer;
99
import com.vladsch.flexmark.util.data.DataHolder;
10+
import com.vladsch.flexmark.util.data.DataSet;
1011
import com.vladsch.flexmark.util.data.MutableDataSet;
1112
import org.jetbrains.annotations.NotNull;
1213
import org.jetbrains.annotations.Nullable;
@@ -36,7 +37,7 @@ protected boolean wantExampleInfo() {
3637

3738
@Override
3839
final public @NotNull SpecExampleRenderer getSpecExampleRenderer(@NotNull SpecExample example, @Nullable DataHolder exampleOptions) {
39-
DataHolder combinedOptions = combineOptions(myDefaultOptions, exampleOptions);
40+
DataHolder combinedOptions = aggregate(myDefaultOptions, exampleOptions);
4041
return new FlexmarkSpecExampleRenderer(example, combinedOptions, Parser.builder(combinedOptions).build(), HtmlRenderer.builder(combinedOptions).build(), wantExampleInfo());
4142
}
4243
}

0 commit comments

Comments
 (0)