Merge pull request #296 from wise0704/generic

Fix generic method invocation performance

Author: JoeRobich

grammars/csharp.tmLanguage

@@ -6771,10 +6771,10 @@
 (
   <
   (?<type_args>
-    [^<>()]+|
-    <\g<type_args>+>|
-    \(\g<type_args>+\)
-  )+
+    [^<>()]++|
+    <\g<type_args>*+>|
+    \(\g<type_args>*+\)
+  )*+
   >\s*
 )?                                                # type arguments
 (?=\()                                            # open paren of argument list</string>

grammars/csharp.tmLanguage.cson

@@ -4056,10 +4056,10 @@ repository:
       (
         <
         (?<type_args>
-          [^<>()]+|
-          <\\g<type_args>+>|
-          \\(\\g<type_args>+\\)
-        )+
+          [^<>()]++|
+          <\\g<type_args>*+>|
+          \\(\\g<type_args>*+\\)
+        )*+
         >\\s*
       )?                                                # type arguments
       (?=\\()                                            # open paren of argument list

src/csharp.tmLanguage.yml

@@ -2582,10 +2582,10 @@ repository:
       (
         <
         (?<type_args>
-          [^<>()]+|
-          <\g<type_args>+>|
-          \(\g<type_args>+\)
-        )+
+          [^<>()]++|
+          <\g<type_args>*+>|
+          \(\g<type_args>*+\)
+        )*+
         >\s*
       )?                                                # type arguments
       (?=\()                                            # open paren of argument list

test/expressions.tests.ts

@@ -3013,6 +3013,28 @@ f(A<(B,C)>(D+E));`);
         ]);
       });
 
+      it("generic with long type arg candidate (issue #295)", async () => {
+        const input = Input.InMethod(`
+if (currentTab < lastTab && setTabWithoutUpdate(currentTab)) { }`);
+        const tokens = await tokenize(input);
+
+        tokens.should.deep.equal([
+          Token.Keyword.Conditional.If,
+          Token.Punctuation.OpenParen,
+          Token.Variable.ReadWrite("currentTab"),
+          Token.Operator.Relational.LessThan,
+          Token.Variable.ReadWrite("lastTab"),
+          Token.Operator.Logical.And,
+          Token.Identifier.MethodName("setTabWithoutUpdate"),
+          Token.Punctuation.OpenParen,
+          Token.Variable.ReadWrite("currentTab"),
+          Token.Punctuation.CloseParen,
+          Token.Punctuation.CloseParen,
+          Token.Punctuation.OpenBrace,
+          Token.Punctuation.CloseBrace,
+        ]);
+      });
+
       it("member of generic with no arguments", async () => {
         const input = Input.InMethod(`C<int>.M();`);
         const tokens = await tokenize(input);