Merge pull request #328 from slevithan/rm-overlapping-recursion

JoeRobich · web-flow · commit 9d446ab1fd31 · 2025-01-23T10:17:18.000-08:00
Refactor overlapping recursion for broader compatibility
diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
@@ -6807,10 +6807,10 @@
 (
   &lt;
   (?&lt;type_args&gt;
-    [^&lt;&gt;()]++|
-    &lt;\g&lt;type_args&gt;*+&gt;|
-    \(\g&lt;type_args&gt;*+\)
-  )*+
+    [^&lt;&gt;()]|
+    \((?:[^&lt;&gt;()]|&lt;[^&lt;&gt;()]*&gt;|\([^&lt;&gt;()]*\))*\)|
+    &lt;\g&lt;type_args&gt;*&gt;
+  )*
   &gt;\s*
 )?                                                # type arguments
 (?=\()                                            # open paren of argument list</string>
diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
@@ -4080,10 +4080,10 @@ repository:
       (
         <
         (?<type_args>
-          [^<>()]++|
-          <\\g<type_args>*+>|
-          \\(\\g<type_args>*+\\)
-        )*+
+          [^<>()]|
+          \\((?:[^<>()]|<[^<>()]*>|\\([^<>()]*\\))*\\)|
+          <\\g<type_args>*>
+        )*
         >\\s*
       )?                                                # type arguments
       (?=\\()                                            # open paren of argument list
diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
@@ -2593,10 +2593,10 @@ repository:
       (
         <
         (?<type_args>
-          [^<>()]++|
-          <\g<type_args>*+>|
-          \(\g<type_args>*+\)
-        )*+
+          [^<>()]|
+          \((?:[^<>()]|<[^<>()]*>|\([^<>()]*\))*\)|
+          <\g<type_args>*>
+        )*
         >\s*
       )?                                                # type arguments
       (?=\()                                            # open paren of argument list
