Address Styling Comments

Author: rdestefa

commonmark-ext-gfm-alerts/README.md

@@ -42,7 +42,7 @@ Allow authors to provide custom titles per alert by adding text after the alert
 marker on the same line:
 
 ```java
-var extension = AlertsExtension.builder().allowCustomTitles().build();
+var extension = AlertsExtension.builder().allowCustomTitles(true).build();
 ```
 
 ```markdown
@@ -71,7 +71,7 @@ blocks are parsed as regular block quotes.
 This behavior can be changed to allow nested alerts:
 
 ```java
-var extension = AlertsExtension.builder().allowNestedAlerts().build();
+var extension = AlertsExtension.builder().allowNestedAlerts(true).build();
 ```
 
 ### Styling

commonmark-ext-gfm-alerts/src/main/java/org/commonmark/ext/gfm/alerts/AlertsExtension.java

@@ -120,43 +120,28 @@ public Builder addCustomType(String type, String title) {
         }
 
         /**
-         * Allows custom titles on alerts. See {@link AlertTitle} for more information.
+         * Allows or disallows custom titles on alerts. See {@link AlertTitle} for more information.
+         * @param allow Whether to allow or disallow custom titles on alerts.
          * @return {@code this}
          */
-        public Builder allowCustomTitles() {
-            customTitlesAllowed = true;
+        public Builder allowCustomTitles(boolean allow) {
+            customTitlesAllowed = allow;
             return this;
         }
 
         /**
-         * Disallows custom titles on alerts. See {@link AlertTitle} for more information.
-         * @return {@code this}
-         */
-        public Builder disallowCustomTitles() {
-            customTitlesAllowed = false;
-            return this;
-        }
-
-        /**
-         * Allows alerts to be parsed within blocks other than {@code Document} (the root).
+         * Allows or disallows parsing alerts within non-root blocks ({@code Document}).
          * <p>
-         * Note that even with this enabled, {@link Parser.Builder#maxOpenBlockParsers(int)}
-         * will be respected.
-         * @return {@code this}
-         */
-        public Builder allowNestedAlerts() {
-            nestedAlertsAllowed = true;
-            return this;
-        }
-
-        /**
-         * Prevents alerts from being parsed within blocks other than {@code Document}
-         * (the root). If an alert appears within another block, it will be parsed as
+         * When disallowed, if an alert appears within another block, it will be parsed as
          * a regular {@code BlockQuote}.
+         * <p>
+         * Note that even when this is allowed, {@link Parser.Builder#maxOpenBlockParsers(int)}
+         * will be respected.
+         * @param allow Whether to allow or disallow parsing alerts within non-root blocks.
          * @return {@code this}
          */
-        public Builder disallowNestedAlerts() {
-            nestedAlertsAllowed = false;
+        public Builder allowNestedAlerts(boolean allow) {
+            nestedAlertsAllowed = allow;
             return this;
         }
 

commonmark-ext-gfm-alerts/src/main/java/org/commonmark/ext/gfm/alerts/internal/AlertBlockParser.java

@@ -59,14 +59,14 @@ public BlockContinue tryContinue(ParserState state) {
          * (with up to 3 leading spaces, optional space after '>')
          */
         var line = state.getLine().getContent();
-        int nextNonSpace = state.getNextNonSpaceIndex();
+        var nextNonSpace = state.getNextNonSpaceIndex();
         if (state.getIndent() >= 4 // Parsing.CODE_BLOCK_INDENT
                 || nextNonSpace >= line.length()
                 || line.charAt(nextNonSpace) != '>') {
             return BlockContinue.none();
         }
 
-        int newColumn = state.getColumn() + state.getIndent() + 1;
+        var newColumn = state.getColumn() + state.getIndent() + 1;
         if (Characters.isSpaceOrTab(line, nextNonSpace + 1)) {
             newColumn++;
         }
@@ -150,7 +150,7 @@ public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockPar
             }
 
             var line = state.getLine().getContent();
-            int nextNonSpace = state.getNextNonSpaceIndex();
+            var nextNonSpace = state.getNextNonSpaceIndex();
 
             // Case A: Fresh start. Line begins with '>'.
             if (nextNonSpace < line.length() && line.charAt(nextNonSpace) == '>') {
@@ -205,24 +205,20 @@ private BlockStart tryStartFresh(CharSequence line, int nextNonSpace, ParserStat
                 afterGt = state.getIndex();
             }
 
-            Matcher matcher;
-            if (customTitlesAllowed) {
-                matcher = ALERT_PATTERN_CUSTOM_TITLE.matcher(line.subSequence(afterGt, line.length()));
-            } else {
-                matcher = ALERT_PATTERN_NO_CUSTOM_TITLE.matcher(line.subSequence(afterGt, line.length()));
-            }
+            var pattern = customTitlesAllowed ? ALERT_PATTERN_CUSTOM_TITLE : ALERT_PATTERN_NO_CUSTOM_TITLE;
+            var matcher = pattern.matcher(line.subSequence(afterGt, line.length()));
 
             if (!matcher.matches()) {
                 return BlockStart.none();
             }
 
-            String typeOriginalCase = matcher.group(1);
-            String type = typeOriginalCase.toUpperCase(Locale.ROOT);
+            var typeOriginalCase = matcher.group(1);
+            var type = typeOriginalCase.toUpperCase(Locale.ROOT);
             if (!allowedTypes.contains(type)) {
                 return BlockStart.none();
             }
 
-            String titleContent = "";
+            var titleContent = "";
             if (customTitlesAllowed) {
                 titleContent = matcher.group(2).replaceFirst("^[ \\t]+", "").stripTrailing();
             }

commonmark-ext-gfm-alerts/src/main/java/org/commonmark/ext/gfm/alerts/internal/AlertHtmlNodeRenderer.java

@@ -113,7 +113,7 @@ private boolean isCommentOnlyTitle(Node title) {
     }
 
     private boolean isHtmlComment(HtmlInline htmlInline) {
-        String literal = htmlInline.getLiteral();
+        var literal = htmlInline.getLiteral();
         if (literal == null || !literal.startsWith("<!--")) {
             return false;
         }

commonmark-ext-gfm-alerts/src/test/java/org/commonmark/ext/gfm/alerts/AlertsMarkdownRendererTest.java

@@ -15,7 +15,7 @@ public class AlertsMarkdownRendererTest {
     private static final Parser PARSER = Parser.builder().extensions(EXTENSIONS).build();
     private static final MarkdownRenderer RENDERER = MarkdownRenderer.builder().extensions(EXTENSIONS).build();
 
-    private static final Set<Extension> EXTENSIONS_CUSTOM_TITLES = Set.of(AlertsExtension.builder().allowCustomTitles().build());
+    private static final Set<Extension> EXTENSIONS_CUSTOM_TITLES = Set.of(AlertsExtension.builder().allowCustomTitles(true).build());
     private static final Parser PARSER_CUSTOM_TITLES = Parser.builder()
                                                              .extensions(EXTENSIONS_CUSTOM_TITLES)
                                                              .build();

commonmark-ext-gfm-alerts/src/test/java/org/commonmark/ext/gfm/alerts/AlertsTest.java

@@ -18,7 +18,7 @@ public class AlertsTest extends RenderingTestCase {
     private static final Parser PARSER = Parser.builder().extensions(EXTENSIONS).build();
     private static final HtmlRenderer HTML_RENDERER = HtmlRenderer.builder().extensions(EXTENSIONS).build();
 
-    private static final Set<Extension> EXTENSIONS_CUSTOM_TITLES = Set.of(AlertsExtension.builder().allowCustomTitles().build());
+    private static final Set<Extension> EXTENSIONS_CUSTOM_TITLES = Set.of(AlertsExtension.builder().allowCustomTitles(true).build());
     private static final Parser PARSER_CUSTOM_TITLES = Parser.builder()
                                                              .extensions(EXTENSIONS_CUSTOM_TITLES)
                                                              .build();
@@ -335,7 +335,7 @@ public void noNestedAlertsByDefaultLeadingEmptyLines() {
 
     @Test
     public void nestedAlerts() {
-        Extension extension = AlertsExtension.builder().allowNestedAlerts().build();
+        Extension extension = AlertsExtension.builder().allowNestedAlerts(true).build();
         Parser parser = Parser.builder().extensions(Set.of(extension)).build();
         HtmlRenderer renderer = HtmlRenderer.builder().extensions(Set.of(extension)).build();