< followed by default can be cast or arrow type parameter

Fixes #62

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -320,7 +320,7 @@ repository:
         '3': { name: storage.type.namespace.ts }
         '4': { name: entity.name.type.module.ts }
     - name: meta.export.default.ts
-      begin: (?<!\.|\$)\b(export)(?:(?:\s*(=))|(?:\s+(default)\s+))
+      begin: (?<!\.|\$)\b(export)(?:(?:\s*(=))|(?:\s+(default)(?=\s+)))
       beginCaptures:
         '1': { name: keyword.control.export.ts }
         '2': { name: keyword.operator.assignment.ts }
@@ -968,7 +968,7 @@ repository:
     # If '<' is preceeded by 'return', 'throw', 'yield', or 'await', it's most likely a type assertion
     # If '=', '(', ',', ':', or '>' are followed by a '<', it is also likely a type assertion as otherwise it would be a syntax error
     # '<=' and '<<=' are cannot be type assertions, as they are assignment operators.
-    begin: '(?:(?<=return|throw|yield|await|[=(,:>*]))\s*(<)(?!<?\=)'
+    begin: '(?:(?<=return|throw|yield|await|default|[=(,:>*]))\s*(<)(?!<?\=)'
     beginCaptures:
       '1': { name: meta.brace.angle.ts }
     end: '>'
@@ -1093,7 +1093,7 @@ repository:
         '1': { name: storage.modifier.async.ts }
         '2': { name: variable.parameter.ts }
     - name: meta.arrow.ts
-      begin: (?x)(?<=return|throw|yield|await|async|[=(\[,:>*])\s*(?=(<[^<>]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*)?\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=>)
+      begin: (?x)(?<=return|throw|yield|await|async|default|[=(\[,:>*])\s*(?=(<[^<>]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*)?\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=>)
       end: (?==>)
       patterns:
       - include: '#comment'

TypeScript.tmLanguage

@@ -1032,7 +1032,7 @@
             <key>name</key>
             <string>meta.export.default.ts</string>
             <key>begin</key>
-            <string>(?&lt;!\.|\$)\b(export)(?:(?:\s*(=))|(?:\s+(default)\s+))</string>
+            <string>(?&lt;!\.|\$)\b(export)(?:(?:\s*(=))|(?:\s+(default)(?=\s+)))</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
@@ -2976,7 +2976,7 @@
         <key>name</key>
         <string>cast.expr.ts</string>
         <key>begin</key>
-        <string>(?:(?&lt;=return|throw|yield|await|[=(,:&gt;*]))\s*(&lt;)(?!&lt;?\=)</string>
+        <string>(?:(?&lt;=return|throw|yield|await|default|[=(,:&gt;*]))\s*(&lt;)(?!&lt;?\=)</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -3348,7 +3348,7 @@
             <key>name</key>
             <string>meta.arrow.ts</string>
             <key>begin</key>
-            <string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=(&lt;[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*&gt;\s*)?\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
+            <string>(?x)(?&lt;=return|throw|yield|await|async|default|[=(\[,:&gt;*])\s*(?=(&lt;[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*&gt;\s*)?\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
             <key>end</key>
             <string>(?==&gt;)</string>
             <key>patterns</key>

TypeScriptReact.tmLanguage

@@ -1036,7 +1036,7 @@
             <key>name</key>
             <string>meta.export.default.tsx</string>
             <key>begin</key>
-            <string>(?&lt;!\.|\$)\b(export)(?:(?:\s*(=))|(?:\s+(default)\s+))</string>
+            <string>(?&lt;!\.|\$)\b(export)(?:(?:\s*(=))|(?:\s+(default)(?=\s+)))</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
@@ -3330,7 +3330,7 @@
             <key>name</key>
             <string>meta.arrow.tsx</string>
             <key>begin</key>
-            <string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=(&lt;[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*&gt;\s*)?\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
+            <string>(?x)(?&lt;=return|throw|yield|await|async|default|[=(\[,:&gt;*])\s*(?=(&lt;[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*(\&lt;[^&lt;&gt;]+\&gt;)*[^&lt;&gt;]*&gt;\s*)?\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
             <key>end</key>
             <string>(?==&gt;)</string>
             <key>patterns</key>

tests/baselines/Issue200.baseline.txt

@@ -83,10 +83,8 @@ Grammar: TypeScript.tmLanguage
          source.ts meta.block.ts meta.export.default.ts
           ^^^^^^^
           source.ts meta.block.ts meta.export.default.ts keyword.control.default.ts
-                 ^
+                 ^^^^^^
                  source.ts meta.block.ts meta.export.default.ts
-                  ^^^^^
-                  source.ts meta.block.ts meta.export.default.ts
                        ^
                        source.ts meta.block.ts punctuation.terminator.statement.ts
                         ^^

tests/baselines/Issue200.txt

@@ -33,8 +33,8 @@ Grammar: TypeScript.tmLanguage
    [5, 3]: source.ts meta.block.ts meta.export.default.ts keyword.control.export.ts 
           ^^^^^^^
           [5, 10]: source.ts meta.block.ts meta.export.default.ts keyword.control.default.ts 
-                  ^^^^^
-                  [5, 18]: source.ts meta.block.ts meta.export.default.ts 
+                 ^^^^^^
+                 [5, 18]: source.ts meta.block.ts meta.export.default.ts 
 >}
  ^
  [6, 1]: source.ts meta.block.ts punctuation.definition.block.ts 

tests/baselines/Issue62.baseline.txt

@@ -0,0 +1,46 @@
+original file
+-----------------------------------
+// @onlyOwnGrammar - As this has type assertion
+export default <ApplicationConfig> {
+    // config object
+}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>// @onlyOwnGrammar - As this has type assertion
+ ^^
+ source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
+   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   source.ts comment.line.double-slash.ts
+>export default <ApplicationConfig> {
+ ^^^^^^
+ source.ts meta.export.default.ts keyword.control.export.ts
+       ^
+       source.ts meta.export.default.ts
+        ^^^^^^^
+        source.ts meta.export.default.ts keyword.control.default.ts
+               ^
+               source.ts meta.export.default.ts cast.expr.ts
+                ^
+                source.ts meta.export.default.ts cast.expr.ts meta.brace.angle.ts
+                 ^^^^^^^^^^^^^^^^^
+                 source.ts meta.export.default.ts cast.expr.ts entity.name.type.ts
+                                  ^
+                                  source.ts meta.export.default.ts cast.expr.ts meta.brace.angle.ts
+                                   ^
+                                   source.ts meta.export.default.ts
+                                    ^
+                                    source.ts meta.export.default.ts meta.object-literal.ts punctuation.definition.block.ts
+                                     ^^
+                                     source.ts meta.export.default.ts meta.object-literal.ts
+>    // config object
+ ^^^^
+ source.ts meta.export.default.ts meta.object-literal.ts punctuation.whitespace.comment.leading.ts
+     ^^
+     source.ts meta.export.default.ts meta.object-literal.ts comment.line.double-slash.ts punctuation.definition.comment.ts
+       ^^^^^^^^^^^^^^^
+       source.ts meta.export.default.ts meta.object-literal.ts comment.line.double-slash.ts
+>}
+ ^
+ source.ts meta.export.default.ts meta.object-literal.ts punctuation.definition.block.ts

tests/cases/Issue62.ts

@@ -0,0 +1,4 @@
+// @onlyOwnGrammar - As this has type assertion
+export default <ApplicationConfig> {
+    // config object
+}