End type parameter regex only on '>'

Fixes #452
microsoft · May 18, 2017 · 632a9db · 632a9db
1 parent ac0314e
commit 632a9db
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 3 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -1037,7 +1037,7 @@ repository:
     begin: '(<)'
     beginCaptures:
       '1': { name: punctuation.definition.typeparameters.begin.ts }
-    end: '(?=$)|(>)'
+    end: '(>)'
     endCaptures:
       '1': { name: punctuation.definition.typeparameters.end.ts }
     patterns:

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -3125,7 +3125,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=$)|(&gt;)</string>
+        <string>(&gt;)</string>
         <key>endCaptures</key>
         <dict>
           <key>1</key>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -3129,7 +3129,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=$)|(&gt;)</string>
+        <string>(&gt;)</string>
         <key>endCaptures</key>
         <dict>
           <key>1</key>

diff --git a/tests/baselines/Issue452.baseline.txt b/tests/baselines/Issue452.baseline.txt
@@ -0,0 +1,100 @@
+original file
+-----------------------------------
+class Test<A, B>{}
+class Favorite extends Test<
+  string | number,
+  undefined
+> {
+  // class content  
+}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>class Test<A, B>{}
+ ^^^^^
+ source.ts meta.class.ts storage.type.class.ts
+      ^
+      source.ts meta.class.ts
+       ^^^^
+       source.ts meta.class.ts entity.name.type.class.ts
+           ^
+           source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
+            ^
+            source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts
+             ^
+             source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts
+              ^
+              source.ts meta.class.ts meta.type.parameters.ts
+               ^
+               source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts
+                ^
+                source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
+                 ^
+                 source.ts meta.class.ts punctuation.definition.block.ts
+                  ^
+                  source.ts meta.class.ts punctuation.definition.block.ts
+                   ^^
+                   source.ts
+>class Favorite extends Test<
+ ^^^^^
+ source.ts meta.class.ts storage.type.class.ts
+      ^
+      source.ts meta.class.ts
+       ^^^^^^^^
+       source.ts meta.class.ts entity.name.type.class.ts
+               ^
+               source.ts meta.class.ts
+                ^^^^^^^
+                source.ts meta.class.ts storage.modifier.ts
+                       ^
+                       source.ts meta.class.ts
+                        ^^^^
+                        source.ts meta.class.ts entity.other.inherited-class.ts
+                            ^
+                            source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
+                             ^^
+                             source.ts meta.class.ts meta.type.parameters.ts
+>  string | number,
+ ^^
+ source.ts meta.class.ts meta.type.parameters.ts
+   ^^^^^^
+   source.ts meta.class.ts meta.type.parameters.ts support.type.primitive.ts
+         ^
+         source.ts meta.class.ts meta.type.parameters.ts
+          ^
+          source.ts meta.class.ts meta.type.parameters.ts keyword.operator.type.ts
+           ^
+           source.ts meta.class.ts meta.type.parameters.ts
+            ^^^^^^
+            source.ts meta.class.ts meta.type.parameters.ts support.type.primitive.ts
+                  ^
+                  source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts
+                   ^^
+                   source.ts meta.class.ts meta.type.parameters.ts
+>  undefined
+ ^^
+ source.ts meta.class.ts meta.type.parameters.ts
+   ^^^^^^^^^
+   source.ts meta.class.ts meta.type.parameters.ts support.type.builtin.ts
+            ^^
+            source.ts meta.class.ts meta.type.parameters.ts
+>> {
+ ^
+ source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
+  ^
+  source.ts meta.class.ts
+   ^
+   source.ts meta.class.ts punctuation.definition.block.ts
+    ^^
+    source.ts meta.class.ts
+>  // class content  
+ ^^
+ source.ts meta.class.ts punctuation.whitespace.comment.leading.ts
+   ^^
+   source.ts meta.class.ts comment.line.double-slash.ts punctuation.definition.comment.ts
+     ^^^^^^^^^^^^^^^^^
+     source.ts meta.class.ts comment.line.double-slash.ts
+>}
+ ^
+ source.ts meta.class.ts punctuation.definition.block.ts
diff --git a/tests/cases/Issue452.ts b/tests/cases/Issue452.ts
@@ -0,0 +1,7 @@
+class Test<A, B>{}
+class Favorite extends Test<
+  string | number,
+  undefined
+> {
+  // class content  
+}