Merge pull request #1089 from DustinCampbell/fix-grammar-perf-issue

Workaround performance issue introduced by regular expression in syntax grammar

Author: DustinCampbell

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.2 (December 24, 2016)
+
+* Fix performance issue when editing type names containing multiple generic type parameters. ([#1088](https://github.com/OmniSharp/omnisharp-vscode/issues/1088), [#1086](https://github.com/OmniSharp/omnisharp-vscode/issues/1086))
+
 ## 1.6.1 (December 22, 2016)
 
 * Fix crash when tasks.json contains comments. ([#1074](https://github.com/OmniSharp/omnisharp-vscode/issues/1074))

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",

syntaxes/csharp.json

@@ -167,7 +167,7 @@
     "type": {
       "patterns": [
         {
-          "match": "([\\w\\.]+\\s*<(?:[\\w\\s,\\.`\\[\\]\\*]+|\\g<1>)+>(?:\\s*\\[\\s*\\])?)",
+          "match": "([\\w\\.]+\\s*<(?:[\\w\\s,\\.`\\[\\]\\*]+)+>(?:\\s*\\[\\s*\\])?)",
           "comment": "generic type",
           "captures": {
             "1": {

test/syntaxes/class.test.syntax.ts

@@ -83,7 +83,11 @@ namespace TestNamespace
             let tokens: Token[] = TokenizerUtil.tokenize(input);
 
             tokens.should.contain(Tokens.ClassKeyword("class", 4, 5));
-            tokens.should.contain(Tokens.ClassIdentifier("Dictionary<T, Dictionary<string, string>>", 4, 11));
+
+            // OLD: tokens.should.contain(Tokens.ClassIdentifier("Dictionary<T, Dictionary<string, string>>", 4, 11));
+            tokens.should.contain(Tokens.ClassIdentifier("Dictionary", 4, 11));
+            tokens.should.contain(Tokens.ClassIdentifier("T", 4, 22));
+            tokens.should.contain(Tokens.ClassIdentifier("Dictionary<string, string>", 4, 25));
         });
 
         it("inheritance", function() {
@@ -106,9 +110,10 @@ namespace TestNamespace
             tokens.should.contain(Tokens.ClassIdentifier("PublicClass<T>", 5, 11));
             tokens.should.contain(Tokens.Type("Root.IInterface<Something.Nested>", 5, 28));
             tokens.should.contain(Tokens.Type("Something.IInterfaceTwo", 5, 63));
-
-            tokens.should.contain(Tokens.Type("Dictionary<T, Dictionary<string, string>>", 6, 28));
-            tokens.should.contain(Tokens.Type("IMap<T, Dictionary<string, string>>", 6, 71));
+            tokens.should.contain(Tokens.Type("Dictionary", 6, 28));
+            tokens.should.contain(Tokens.Type("Dictionary<string, string>", 6, 42));
+            tokens.should.contain(Tokens.Type("IMap", 6, 71));
+            tokens.should.contain(Tokens.Type("Dictionary<string, string>", 6, 79));
         });
 
         it("generic constraints", function() {
@@ -129,7 +134,8 @@ namespace TestNamespace
 
             tokens.should.contain(Tokens.ClassKeyword("class", 5, 5));
             tokens.should.contain(Tokens.ClassIdentifier("PublicClass<T, X>", 5, 11));
-            tokens.should.contain(Tokens.Type("Dictionary<T, List<string>[]>", 5, 31));
+            tokens.should.contain(Tokens.Type("Dictionary", 5, 31));
+            tokens.should.contain(Tokens.Type("List<string>[]", 5, 45));
             tokens.should.contain(Tokens.Type("ISomething", 5, 62));
             tokens.should.contain(Tokens.Keyword("where", 5, 73));
             tokens.should.contain(Tokens.Type("T", 5, 79));

test/syntaxes/event.test.syntax.ts

@@ -36,7 +36,9 @@ public class Tester
 
             tokens.should.contain(Tokens.StorageModifierKeyword("public", 4, 5));
             tokens.should.contain(Tokens.StorageModifierKeyword("event", 4, 12));
-            tokens.should.contain(Tokens.Type("EventHandler<List<T>, Dictionary<T, D>>", 4, 18));
+            tokens.should.contain(Tokens.Type("EventHandler", 4, 18));
+            tokens.should.contain(Tokens.Type("List<T>", 4, 31));
+            tokens.should.contain(Tokens.Type("Dictionary<T, D>", 4, 40));
             tokens.should.contain(Tokens.EventIdentifier("Event", 4, 58));
         });
     });

test/syntaxes/field.test.syntax.ts

@@ -39,7 +39,9 @@ public class Tester
             let tokens: Token[] = TokenizerUtil.tokenize(input);
 
             tokens.should.contain(Tokens.StorageModifierKeyword("private", 4, 5));
-            tokens.should.contain(Tokens.Type("Dictionary< List<T>, Dictionary<T, D>>", 4, 13));
+            tokens.should.contain(Tokens.Type("Dictionary", 4, 13));
+            tokens.should.contain(Tokens.Type("List<T>", 4, 25));
+            tokens.should.contain(Tokens.Type("Dictionary<T, D>", 4, 34));
             tokens.should.contain(Tokens.FieldIdentifier("_field", 4, 52));
         });
 

test/syntaxes/property.test.syntax.ts

@@ -105,7 +105,9 @@ class Tester
             let tokens: Token[] = TokenizerUtil.tokenize(input);
 
             tokens.should.contain(Tokens.StorageModifierKeyword("public", 4, 5));
-            tokens.should.contain(Tokens.Type("Dictionary<string, List<T>[]>", 4, 12));
+            tokens.should.contain(Tokens.Type("Dictionary", 4, 12));
+            tokens.should.contain(Tokens.Type("string", 4, 23));
+            tokens.should.contain(Tokens.Type("List<T>[]", 4, 31));
             tokens.should.contain(Tokens.PropertyIdentifier("Property", 4, 42));
             tokens.should.contain(Tokens.Keyword("get", 4, 53));
             tokens.should.contain(Tokens.Keyword("set", 4, 58));
@@ -122,7 +124,9 @@ class Tester
             let tokens: Token[] = TokenizerUtil.tokenize(input);
 
             tokens.should.contain(Tokens.StorageModifierKeyword("public", 4, 5));
-            tokens.should.contain(Tokens.Type("Dictionary<string, List<T>[]>", 4, 12));
+            tokens.should.contain(Tokens.Type("Dictionary", 4, 12));
+            tokens.should.contain(Tokens.Type("string", 4, 23));
+            tokens.should.contain(Tokens.Type("List<T>[]", 4, 31));
             tokens.should.contain(Tokens.PropertyIdentifier("Property", 4, 42));
             tokens.should.contain(Tokens.Keyword("get", 4, 53));
             tokens.should.contain(Tokens.StorageModifierKeyword("new", 4, 62));