tree-sitter character classes which include dashes must have dashes at the end of class 🤷

Author: cscheid

crates/tree-sitter-qmd/tree-sitter-markdown-inline/grammar.js

@@ -216,10 +216,10 @@ module.exports = grammar(add_inline_rules({
                 alias("}", $.citation_delimiter),
             ),
             seq(alias($._cite_author_in_text, $.citation_delimiter),
-                alias(new RegExp('[0-9A-Za-z_]+([:.#$%&-+?<>~/][0-9A-Za-z_]+)*'), $.citation_id_author_in_text)
+                alias(new RegExp('[0-9A-Za-z_]+([:.#$%&+?<>~/-][0-9A-Za-z_]+)*'), $.citation_id_author_in_text)
             ),
             seq(alias($._cite_suppress_author, $.citation_delimiter),
-                alias(new RegExp('[0-9A-Za-z_]+([:.#$%&-+?<>~/][0-9A-Za-z_]+)*'), $.citation_id_suppress_author)
+                alias(new RegExp('[0-9A-Za-z_]+([:.#$%&+?<>~/-][0-9A-Za-z_]+)*'), $.citation_id_suppress_author)
             ),
         ),
 
@@ -266,8 +266,8 @@ module.exports = grammar(add_inline_rules({
         //   - URLs with query parameters have both question marks and equals signs
 
         shortcode_naked_string: $ => 
-            choice(token(prec(1, /(?:[A-Za-z0-9_\-.~:/?#\]@!$&()+,;]|\[)+/)),
-                   token(prec(1, /(?:[A-Za-z0-9_\-.~:/?#\]@!$&()+,;]|\[)+[?](?:[A-Za-z0-9_\-.~:/?#\]@!$&()+,;?=]|\[)+/))),
+            choice(token(prec(1, /(?:[A-Za-z0-9_.~:/?#\]@!$&()+,;-]|\[)+/)),
+                   token(prec(1, /(?:[A-Za-z0-9_.~:/?#\]@!$&()+,;-]|\[)+[?](?:[A-Za-z0-9_.~:/?#\]@!$&()+,;?=-]|\[)+/))),
 
         // shortcode_string: $ => new RegExp("[a-zA-Z_][a-zA-Z0-9_-]*"),
         shortcode_string: $ => choice(

crates/tree-sitter-qmd/tree-sitter-markdown-inline/src/grammar.json

@@ -2662,7 +2662,7 @@
               "type": "ALIAS",
               "content": {
                 "type": "PATTERN",
-                "value": "[0-9A-Za-z_]+([:.#$%&-+?<>~/][0-9A-Za-z_]+)*"
+                "value": "[0-9A-Za-z_]+([:.#$%&+?<>~/-][0-9A-Za-z_]+)*"
               },
               "named": true,
               "value": "citation_id_author_in_text"
@@ -2685,7 +2685,7 @@
               "type": "ALIAS",
               "content": {
                 "type": "PATTERN",
-                "value": "[0-9A-Za-z_]+([:.#$%&-+?<>~/][0-9A-Za-z_]+)*"
+                "value": "[0-9A-Za-z_]+([:.#$%&+?<>~/-][0-9A-Za-z_]+)*"
               },
               "named": true,
               "value": "citation_id_suppress_author"
@@ -2878,7 +2878,7 @@
             "value": 1,
             "content": {
               "type": "PATTERN",
-              "value": "(?:[A-Za-z0-9_\\-.~:/?#\\]@!$&()+,;]|\\[)+"
+              "value": "(?:[A-Za-z0-9_.~:/?#\\]@!$&()+,;-]|\\[)+"
             }
           }
         },
@@ -2889,7 +2889,7 @@
             "value": 1,
             "content": {
               "type": "PATTERN",
-              "value": "(?:[A-Za-z0-9_\\-.~:/?#\\]@!$&()+,;]|\\[)+[?](?:[A-Za-z0-9_\\-.~:/?#\\]@!$&()+,;?=]|\\[)+"
+              "value": "(?:[A-Za-z0-9_.~:/?#\\]@!$&()+,;-]|\\[)+[?](?:[A-Za-z0-9_.~:/?#\\]@!$&()+,;?=-]|\\[)+"
             }
           }
         }

crates/tree-sitter-qmd/tree-sitter-markdown-inline/src/parser.c

@@ -14213,9 +14213,9 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 2260:
       ACCEPT_TOKEN(aux_sym_citation_token2);
-      if (('#' <= lookahead && lookahead <= '+') ||
-          lookahead == '.' ||
-          lookahead == '/' ||
+      if (('#' <= lookahead && lookahead <= '&') ||
+          lookahead == '+' ||
+          ('-' <= lookahead && lookahead <= '/') ||
           lookahead == ':' ||
           lookahead == '<' ||
           lookahead == '>' ||

crates/tree-sitter-qmd/tree-sitter-markdown-inline/test/corpus/syntax.txt

@@ -213,3 +213,14 @@ Mixed nested spans
     (text_base)
     (emphasis_delimiter))
   (soft_line_break))
+================================================================================
+cites with dashes
+================================================================================
+see @fig-1
+--------------------------------------------------------------------------------
+(inline
+  (text_base)
+  (text_base)
+  (citation
+    (citation_delimiter)
+    (citation_id_author_in_text)))