minor fixes

Author: vsch

.gitignore

@@ -35,3 +35,4 @@ target/
 /flexmark-docx-converter/src/test/resources/PageBreak.xml
 /flexmark-docx-converter/src/test/resources/Tab.s.xml
 /flexmark-docx-converter/src/test/resources/Tab.xml
+/assets/comms/

VERSION.md

@@ -9,6 +9,8 @@ flexmark-java
 - [Next 0.60.0](#next-0600)
     - [API Changes](#api-changes)
 - [Next](#next)
+- [Next 0.59.40](#next-05940)
+- [0.59.38](#05938)
 - [0.59.36](#05936)
 - [0.59.34](#05934)
 - [0.59.32](#05932)
@@ -161,6 +163,21 @@ Next
       [Yaml Front Matter Configuration](../../wiki/Yaml-Front-Matter-Configuration)
 * [ ] Add: spec example language per section options and rendering in HTML.
 
+Next 0.59.40
+------------
+
+* [ ] Add: `RichSequence.trimEndToEOL()`
+* [ ] Add: `RichSequence.trimStartToEOL()`
+* [ ] Add: `RichSequence.extendEndToEOL()`
+* [ ] Add: `RichSequence.extendStartToEOL()`
+
+0.59.38
+-------
+
+* Fix: remove unnecessary type param from `MutableDataHolder.remove(DataKeyBase<?>)`
+* Fix: `Parser.HEADING_NO_EMPTY_HEADING_WITHOUT_SPACE` had wrong regex. Did not allow non-empty
+  headings without space either.
+
 0.59.36
 -------
 

flexmark-ext-attributes/src/test/java/com/vladsch/flexmark/ext/attributes/ComboExtAttributesSpecTest.java

@@ -58,6 +58,7 @@ public class ComboExtAttributesSpecTest extends RendererSpecTest {
         optionsMap.put("fenced-code-to-code", new MutableDataSet().set(AttributesExtension.FENCED_CODE_ADD_ATTRIBUTES, FencedCodeAddType.ADD_TO_CODE));
         optionsMap.put("custom", new MutableDataSet().set(CUSTOM_OPTION, (option, text) -> null));
     }
+
     public ComboExtAttributesSpecTest(@NotNull SpecExample example) {
         super(example, optionsMap, OPTIONS);
     }

flexmark-ext-attributes/src/test/resources/ext_attributes_ast_spec.md

@@ -2866,9 +2866,6 @@ Document[0, 35]
       AttributeNode[17, 34] name:[17, 24, "caption"] sep:[24, 25, "="] valueOpen:[25, 26, "\""] value:[26, 33, "Caption"] valueClose:[33, 34, "\""]
 ````````````````````````````````
 -->
-
-
-
 ```````````````````````````````` example(Fenced Code: 20) options(info-attributes, fenced-code-to-code)
 ```plantuml
 ```

flexmark-util/src/main/java/com/vladsch/flexmark/util/Pair.java

@@ -1,5 +1,7 @@
 package com.vladsch.flexmark.util;
 
+import java.util.Objects;
+
 public class Pair<K, V> implements Paired<K, V> {
     public static <K1, V1> Pair<K1, V1> of(K1 first, V1 second) {
         return new Pair<>(first, second);
@@ -49,8 +51,8 @@ public boolean equals(Object o) {
 
         Pair<?, ?> pair = (Pair<?, ?>) o;
 
-        if (myFirst != null ? !myFirst.equals(pair.myFirst) : pair.myFirst != null) return false;
-        return mySecond != null ? mySecond.equals(pair.mySecond) : pair.mySecond == null;
+        if (!Objects.equals(myFirst, pair.myFirst)) return false;
+        return Objects.equals(mySecond, pair.mySecond);
     }
 
     @Override

flexmark-util/src/main/java/com/vladsch/flexmark/util/ast/Document.java

@@ -56,7 +56,7 @@ public Document(DataHolder options, BasedSequence chars) {
 
     @NotNull
     @Override
-    public <T> MutableDataSet remove(@NotNull DataKeyBase<T> key) {return dataSet.remove(key);}
+    public MutableDataSet remove(@NotNull DataKeyBase<?> key) {return dataSet.remove(key);}
 
     @Override
     @Nullable

flexmark-util/src/main/java/com/vladsch/flexmark/util/ast/Node.java

@@ -657,6 +657,17 @@ public static void segmentSpanChars(@NotNull StringBuilder out, @NotNull BasedSe
             segmentSpanChars(out, sequence.getStartOffset(), sequence.getEndOffset(), name, sequence.toString());
     }
 
+    public static void segmentSpanCharsToVisible(@NotNull StringBuilder out, @NotNull BasedSequence sequence, @NotNull String name) {
+        if (sequence.isNotNull()) {
+            if (sequence.length() <= 10) {
+                segmentSpanChars(out, sequence.getStartOffset(), sequence.getEndOffset(), name, sequence.toVisibleWhitespaceString());
+            } else {
+                // give the first 5 and last 5
+                segmentSpanChars(out, sequence.getStartOffset(), sequence.getEndOffset(), name, sequence.subSequence(0, 5).toVisibleWhitespaceString(), SPLICE, sequence.endSequence(sequence.length() - 5).toVisibleWhitespaceString());
+            }
+        }
+    }
+
     public static void delimitedSegmentSpan(
             @NotNull StringBuilder out,
             @NotNull BasedSequence openingSequence,

flexmark-util/src/main/java/com/vladsch/flexmark/util/data/MutableDataHolder.java

@@ -47,7 +47,7 @@ default <T> T get(@NotNull DataKey<T> key) {
      * @param key data key to remove
      * @return mutable data holder for chained calls
      */
-    @NotNull <T> MutableDataHolder remove(@NotNull DataKeyBase<T> key);
+    @NotNull MutableDataHolder remove(@NotNull DataKeyBase<?> key);
 
     /**
      * Store the given value for the key

flexmark-util/src/main/java/com/vladsch/flexmark/util/data/MutableDataSet.java

@@ -62,7 +62,7 @@ public MutableDataHolder setIn(@NotNull MutableDataHolder dataHolder) {
 
     @NotNull
     @Override
-    public <T> MutableDataSet remove(@NotNull DataKeyBase<T> key) {
+    public MutableDataSet remove(@NotNull DataKeyBase<?> key) {
         dataSet.remove(key);
         return this;
     }

flexmark/src/main/java/com/vladsch/flexmark/parser/core/HeadingParser.java

@@ -29,7 +29,7 @@ static class HeadingParsing extends Parsing {
         public HeadingParsing(DataHolder options) {
             super(options);
 
-            ATX_HEADING = Parser.HEADING_NO_ATX_SPACE.get(options) ? Pattern.compile("^#{1,6}(?:[ \t]*|$)") : Parser.HEADING_NO_EMPTY_HEADING_WITHOUT_SPACE.get(options) ? Pattern.compile("^#{1,6}[ \t]+") : Pattern.compile("^#{1,6}(?:[ \t]+|$)");
+            ATX_HEADING = Parser.HEADING_NO_ATX_SPACE.get(options) ? Pattern.compile("^#{1,6}(?:[ \t]*|$)") : Parser.HEADING_NO_EMPTY_HEADING_WITHOUT_SPACE.get(options) ? Pattern.compile("^#{1,6}(?:[ \t]*(?=[^ \t#])|[ \t]+$)") : Pattern.compile("^#{1,6}(?:[ \t]+|$)");
             ATX_TRAILING = Parser.HEADING_NO_ATX_SPACE.get(options) ? Pattern.compile("[ \t]*#+[ \t]*$") : Pattern.compile("(^| |\t)[ \t]*#+[ \t]*$");
 
             int minLength = Parser.HEADING_SETEXT_MARKER_LENGTH.get(options);