feat: alternative syntax for named groups

tree-sitter · Nov 10, 2024 · 9b46e66 · 9b46e66
1 parent 7ba126f
commit 9b46e66
Show file tree

Hide file tree

Showing 6 changed files with 1,746 additions and 1,447 deletions.
diff --git a/grammar.js b/grammar.js
@@ -65,6 +65,7 @@ module.exports = grammar({
         $.character_class_escape,
         $._character_escape,
         $.backreference_escape,
+        $.named_group_backreference,
         $.anonymous_capturing_group,
         $.named_capturing_group,
         $.non_capturing_group,
@@ -150,7 +151,7 @@ module.exports = grammar({
 
     anonymous_capturing_group: $ => seq('(', $.pattern, ')'),
 
-    named_capturing_group: $ => seq('(?<', $.group_name, '>', $.pattern, ')'),
+    named_capturing_group: $ => seq(choice('(?<', '(?P<'), $.group_name, '>', $.pattern, ')'),
 
     non_capturing_group: $ => seq('(?:', $.pattern, ')'),
 
@@ -184,6 +185,8 @@ module.exports = grammar({
 
     backreference_escape: $ => seq('\\k', '<', $.group_name, '>'),
 
+    named_group_backreference: $ => seq('(?P=', $.group_name, ')'),
+
     decimal_escape: _ => /\\[1-9][0-9]*/,
 
     character_class_escape: $ => choice(

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -4,6 +4,8 @@
   "(?"
   "(?:"
   "(?<"
+  "(?P<"
+  "(?P="
   ">"
   "["
   "]"

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ @@
       "(?"
       "(?:"
       "(?<"
+      "(?P<"
+      "(?P="
       ">"
       "["
       "]"
@@ Expand Down @@