group dynamic patterns

vsch · Jun 4, 2020 · 46475e4 · 46475e4
1 parent 16baf00
commit 46475e4
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/ast/util/Parsing.java b/flexmark/src/main/java/com/vladsch/flexmark/ast/util/Parsing.java
@@ -157,10 +157,15 @@ public Parsing(DataHolder options) {
         this.itemPrefixChars = LISTS_ITEM_PREFIX_CHARS.get(options);
         this.CODE_BLOCK_INDENT = Parser.CODE_BLOCK_INDENT.get(options); // make sure this is consistent with lists settings
 
-        this.ADDITIONAL_CHARS = ADDITIONAL_CHARS(intellijDummyIdentifier);
-        this.EXCLUDED_0_TO_SPACE = EXCLUDED_0_TO_SPACE(intellijDummyIdentifier);
+        this.HTMLCOMMENT = "<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->";
+        this.PROCESSINGINSTRUCTION = "[<][?].*?[?][>]";
+        this.CDATA = "<!\\[CDATA\\[[\\s\\S]*?\\]\\]>";
+        this.SINGLEQUOTEDVALUE = "'[^']*'";
+        this.DOUBLEQUOTEDVALUE = "\"[^\"]*\"";
 
         this.LINK_DESTINATION_ANGLES = spaceInLinkUrl ? ST_LINK_DESTINATION_ANGLES_SPC : ST_LINK_DESTINATION_ANGLES_NO_SPC;
+        this.ADDITIONAL_CHARS = ADDITIONAL_CHARS(intellijDummyIdentifier);
+        this.EXCLUDED_0_TO_SPACE = EXCLUDED_0_TO_SPACE(intellijDummyIdentifier);
 
         this.REG_CHAR = "[^\\\\()" + EXCLUDED_0_TO_SPACE + "]";
         this.REG_CHAR_PARENS = "[^\\\\" + EXCLUDED_0_TO_SPACE + "]";
@@ -171,29 +176,24 @@ public Parsing(DataHolder options) {
         this.IN_MATCHED_PARENS_NOSP = "\\((" + REG_CHAR + '|' + ESCAPED_CHAR + ")*\\)";
         this.IN_MATCHED_PARENS_W_SP = "\\((" + REG_CHAR_SP + '|' + ESCAPED_CHAR + ")*\\)";
         this.IN_BRACES_W_SP = "\\{\\{(?:[^{}\\\\" + EXCLUDED_0_TO_SPACE + "]| |\t)*\\}\\}";
-        this.HTMLCOMMENT = "<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->";
-        this.PROCESSINGINSTRUCTION = "[<][?].*?[?][>]";
         this.DECLARATION = "<![A-Z" + ADDITIONAL_CHARS + "]+\\s+[^>]*>";
-        this.CDATA = "<!\\[CDATA\\[[\\s\\S]*?\\]\\]>";
         this.ENTITY = "&(?:#x[a-f0-9" + ADDITIONAL_CHARS + "]{1,8}|#[0-9]{1,8}|[a-z" + ADDITIONAL_CHARS + "][a-z0-9" + ADDITIONAL_CHARS + "]{1,31});";
-
         this.TAGNAME = "[A-Za-z" + ADDITIONAL_CHARS + "][A-Za-z0-9" + ADDITIONAL_CHARS + "-]*";
         this.ATTRIBUTENAME = "[a-zA-Z" + ADDITIONAL_CHARS + "_:][a-zA-Z0-9" + ADDITIONAL_CHARS + ":._-]*";
         this.UNQUOTEDVALUE = "[^\"'=<>{}`" + EXCLUDED_0_TO_SPACE + "]+";
-        this.SINGLEQUOTEDVALUE = "'[^']*'";
-        this.DOUBLEQUOTEDVALUE = "\"[^\"]*\"";
-        this.ATTRIBUTEVALUE = "(?:" + UNQUOTEDVALUE + "|" + SINGLEQUOTEDVALUE
-                + "|" + DOUBLEQUOTEDVALUE + ")";
+        this.ATTRIBUTEVALUE = "(?:" + UNQUOTEDVALUE + "|" + SINGLEQUOTEDVALUE + "|" + DOUBLEQUOTEDVALUE + ")";
         this.ATTRIBUTEVALUESPEC = "(?:" + "\\s*=" + "\\s*" + ATTRIBUTEVALUE + ")";
         this.ATTRIBUTE = "(?:" + "\\s+" + ATTRIBUTENAME + ATTRIBUTEVALUESPEC + "?)";
-
         this.OPENTAG = "<" + TAGNAME + ATTRIBUTE + "*" + "\\s*/?>";
         this.CLOSETAG = "</" + TAGNAME + "\\s*[>]";
+        this.ENTITY_HERE = Pattern.compile('^' + ENTITY, Pattern.CASE_INSENSITIVE);
         this.HTMLTAG = "(?:" + OPENTAG + "|" + CLOSETAG + "|" + HTMLCOMMENT
                 + "|" + PROCESSINGINSTRUCTION + "|" + DECLARATION + "|" + CDATA +
                 (htmlForTranslator ? "|<(?:" + translationHtmlInlineTagPattern + ")>|</(?:" + translationHtmlInlineTagPattern + ")>" : "") + ")";
 
         // init patterns
+        this.HTML_TAG = Pattern.compile('^' + HTMLTAG, Pattern.CASE_INSENSITIVE);
+
         this.LINK_DESTINATION = Pattern.compile(
                 "^(?:" + (parseJekyllMacroInLinkUrl ? IN_BRACES_W_SP + "|" : "") +
                         (spaceInLinkUrl ? "(?:" + REG_CHAR_SP + ")|" : REG_CHAR + "|") +
@@ -208,8 +208,6 @@ public Parsing(DataHolder options) {
                 "^(?:" + (parseJekyllMacroInLinkUrl ? IN_BRACES_W_SP + "|" : "")
                         + (REG_CHAR + "|") +
                         ESCAPED_CHAR + "|\\\\|\\(|\\))*");
-
-        this.ENTITY_HERE = Pattern.compile('^' + ENTITY, Pattern.CASE_INSENSITIVE);
 
         this.EMAIL_AUTOLINK = Pattern.compile(
                 "^<(" +
@@ -229,8 +227,6 @@ public Parsing(DataHolder options) {
                         (htmlForTranslator ? "|(?:" + translationAutolinkTagPattern + ")" : "") +
                         ")>");
 
-        this.HTML_TAG = Pattern.compile('^' + HTMLTAG, Pattern.CASE_INSENSITIVE);
-
         if (LISTS_ITEM_MARKER_SPACE.get(options)) {
             if (LISTS_ORDERED_ITEM_DOT_ONLY.get(options)) {
                 this.LIST_ITEM_MARKER = Pattern.compile("^([\\Q" + itemPrefixChars + "\\E])(?=[ \t])|^(\\d{1,9})([.])(?=[ \t])");