Improve scopes of type cast declarations

forivall · forivall · commit 48007533ced4 · 2020-01-03T16:21:56.000-08:00
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -1375,7 +1375,7 @@ repository:
       match: '{{startOfIdentifier}}(as)\s+(const)(?=\s*([,}]|$))'
       captures:
         '1': { name: keyword.control.as.ts }
-        '2': { name: storage.modifier.ts }
+        '2': { name: storage.modifier.const.type.ts }
     - name: meta.object.member.ts
       begin: '{{startOfIdentifier}}(as)\s+'
       beginCaptures:
@@ -1561,7 +1561,7 @@ repository:
       match: \s*(<)\s*(const)\s*(>)
       captures:
         '1':  { name: meta.brace.angle.ts }
-        '2':  { name: storage.modifier.ts }
+        '2':  { name: storage.modifier.const.type.ts }
         '3':  { name: meta.brace.angle.ts }
     - name: cast.expr.ts
       # We need to differentiate between the relational '<' operator and the beginning of a type assertion/cast using the surrounding context.
@@ -1624,11 +1624,12 @@ repository:
     - match: '{{startOfIdentifier}}(as)\s+(const)(?=\s*($|[;,:})\]]))'
       captures:
         '1': { name: keyword.control.as.ts }
-        '2': { name: storage.modifier.ts }
+        '2': { name: storage.modifier.const.type.ts }
     - begin: '{{startOfIdentifier}}(as)\s+'
       beginCaptures:
         '1': { name: keyword.control.as.ts }
       end: (?=$|^|[;,:})\]]|\|\||\&\&|({{startOfIdentifier}}(as)\s+)|(\s+\<))
+      contentName: meta.type.cast.ts
       patterns:
       - include: '#type'
     - name: keyword.operator.spread.ts
diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -4440,7 +4440,7 @@
               <key>2</key>
               <dict>
                 <key>name</key>
-                <string>storage.modifier.ts</string>
+                <string>storage.modifier.const.type.ts</string>
               </dict>
             </dict>
           </dict>
@@ -5099,7 +5099,7 @@
               <key>2</key>
               <dict>
                 <key>name</key>
-                <string>storage.modifier.ts</string>
+                <string>storage.modifier.const.type.ts</string>
               </dict>
               <key>3</key>
               <dict>
@@ -5281,7 +5281,7 @@
               <key>2</key>
               <dict>
                 <key>name</key>
-                <string>storage.modifier.ts</string>
+                <string>storage.modifier.const.type.ts</string>
               </dict>
             </dict>
           </dict>
@@ -5298,6 +5298,8 @@
             </dict>
             <key>end</key>
             <string>(?=$|^|[;,:})\]]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
+            <key>contentName</key>
+            <string>meta.type.cast.ts</string>
             <key>patterns</key>
             <array>
               <dict>
diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -4464,7 +4464,7 @@
               <key>2</key>
               <dict>
                 <key>name</key>
-                <string>storage.modifier.tsx</string>
+                <string>storage.modifier.const.type.tsx</string>
               </dict>
             </dict>
           </dict>
@@ -5227,7 +5227,7 @@
               <key>2</key>
               <dict>
                 <key>name</key>
-                <string>storage.modifier.tsx</string>
+                <string>storage.modifier.const.type.tsx</string>
               </dict>
             </dict>
           </dict>
@@ -5244,6 +5244,8 @@
             </dict>
             <key>end</key>
             <string>(?=$|^|[;,:})\]]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
+            <key>contentName</key>
+            <string>meta.type.cast.tsx</string>
             <key>patterns</key>
             <array>
               <dict>
diff --git a/tests/baselines/Issue314.baseline.txt b/tests/baselines/Issue314.baseline.txt
@@ -36,9 +36,9 @@ Grammar: TypeScript.tmLanguage
                  ^
                  source.ts meta.var.expr.ts
                   ^
-                  source.ts meta.var.expr.ts entity.name.type.ts
+                  source.ts meta.var.expr.ts meta.type.cast.ts entity.name.type.ts
                    ^
-                   source.ts meta.var.expr.ts
+                   source.ts meta.var.expr.ts meta.type.cast.ts
                     ^
                     source.ts meta.var.expr.ts keyword.operator.ternary.ts
                      ^
diff --git a/tests/baselines/Issue500.baseline.txt b/tests/baselines/Issue500.baseline.txt
@@ -15,14 +15,14 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts
       ^^^
-      source.ts support.type.primitive.ts
+      source.ts meta.type.cast.ts support.type.primitive.ts
          ^
-         source.ts
+         source.ts meta.type.cast.ts
           ^^
           source.ts keyword.control.as.ts
             ^
             source.ts
              ^^^^^^
-             source.ts support.type.primitive.ts
+             source.ts meta.type.cast.ts support.type.primitive.ts
                    ^
                    source.ts punctuation.terminator.statement.ts
diff --git a/tests/baselines/Issue59.baseline.txt b/tests/baselines/Issue59.baseline.txt
@@ -45,9 +45,9 @@ Grammar: TypeScript.tmLanguage
                          ^
                          source.ts meta.class.ts meta.field.declaration.ts
                           ^
-                          source.ts meta.class.ts meta.field.declaration.ts meta.object.type.ts punctuation.definition.block.ts
+                          source.ts meta.class.ts meta.field.declaration.ts meta.type.cast.ts meta.object.type.ts punctuation.definition.block.ts
                            ^
-                           source.ts meta.class.ts meta.field.declaration.ts meta.object.type.ts punctuation.definition.block.ts
+                           source.ts meta.class.ts meta.field.declaration.ts meta.type.cast.ts meta.object.type.ts punctuation.definition.block.ts
                             ^
                             source.ts meta.class.ts punctuation.terminator.statement.ts
 >    public a: string;
diff --git a/tests/baselines/Issue647.baseline.txt b/tests/baselines/Issue647.baseline.txt
@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.function.ts meta.block.ts
                 ^^^^^^
-                source.ts meta.function.ts meta.block.ts support.type.primitive.ts
+                source.ts meta.function.ts meta.block.ts meta.type.cast.ts support.type.primitive.ts
                       ^
                       source.ts meta.function.ts meta.block.ts
                        ^
diff --git a/tests/baselines/Issue695.baseline.txt b/tests/baselines/Issue695.baseline.txt
@@ -127,6 +127,6 @@ Grammar: TypeScript.tmLanguage
                                                  ^
                                                  source.ts meta.var.expr.ts
                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-                                                  source.ts meta.var.expr.ts entity.name.type.ts
+                                                  source.ts meta.var.expr.ts meta.type.cast.ts entity.name.type.ts
                                                                              ^
                                                                              source.ts punctuation.terminator.statement.ts
diff --git a/tests/baselines/Issue762.baseline.txt b/tests/baselines/Issue762.baseline.txt
@@ -15,9 +15,9 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts
          ^^^
-         source.ts support.type.primitive.ts
+         source.ts meta.type.cast.ts support.type.primitive.ts
             ^
-            source.ts
+            source.ts meta.type.cast.ts
              ^^
              source.ts keyword.operator.logical.ts
                ^
diff --git a/tests/baselines/constType.baseline.txt b/tests/baselines/constType.baseline.txt
@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage
                              ^
                              source.ts meta.var.expr.ts
                               ^^^^^
-                              source.ts meta.var.expr.ts storage.modifier.ts
+                              source.ts meta.var.expr.ts storage.modifier.const.type.ts
                                    ^
                                    source.ts punctuation.terminator.statement.ts
 >let r2 = {...p} as const;
@@ -87,7 +87,7 @@ Grammar: TypeScript.tmLanguage
                    ^
                    source.ts meta.var.expr.ts
                     ^^^^^
-                    source.ts meta.var.expr.ts storage.modifier.ts
+                    source.ts meta.var.expr.ts storage.modifier.const.type.ts
                          ^
                          source.ts punctuation.terminator.statement.ts
 >let p1 = { x: 10, y: 20 as const };
@@ -134,7 +134,7 @@ Grammar: TypeScript.tmLanguage
                            ^
                            source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
                             ^^^^^
-                            source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts
+                            source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts
                                  ^
                                  source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
                                   ^
@@ -167,7 +167,7 @@ Grammar: TypeScript.tmLanguage
                  ^
                  source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
                   ^^^^^
-                  source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts
+                  source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts
                        ^
                        source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.separator.comma.ts
                         ^
@@ -185,7 +185,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
                                   ^^^^^
-                                  source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts
+                                  source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts
                                        ^
                                        source.ts meta.var.expr.ts meta.objectliteral.ts
                                         ^
diff --git a/tests/baselines/constTypeAssert.baseline.txt b/tests/baselines/constTypeAssert.baseline.txt
@@ -27,7 +27,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
            ^^^^^
-           source.ts meta.var.expr.ts cast.expr.ts storage.modifier.ts
+           source.ts meta.var.expr.ts cast.expr.ts storage.modifier.const.type.ts
                 ^
                 source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
                  ^

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ Grammar: TypeScript.tmLanguage`
`36`	`36`	`^`
`37`	`37`	`source.ts meta.var.expr.ts`
`38`	`38`	`^`
`39`		`- source.ts meta.var.expr.ts entity.name.type.ts`
	`39`	`+ source.ts meta.var.expr.ts meta.type.cast.ts entity.name.type.ts`
`40`	`40`	`^`
`41`		`- source.ts meta.var.expr.ts`
	`41`	`+ source.ts meta.var.expr.ts meta.type.cast.ts`
`42`	`42`	`^`
`43`	`43`	`source.ts meta.var.expr.ts keyword.operator.ternary.ts`
`44`	`44`	`^`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@ Grammar: TypeScript.tmLanguage`
`15`	`15`	`^`
`16`	`16`	`source.ts`
`17`	`17`	`^^^`
`18`		`- source.ts support.type.primitive.ts`
	`18`	`+ source.ts meta.type.cast.ts support.type.primitive.ts`
`19`	`19`	`^`
`20`		`- source.ts`
	`20`	`+ source.ts meta.type.cast.ts`
`21`	`21`	`^^`
`22`	`22`	`source.ts keyword.control.as.ts`
`23`	`23`	`^`
`24`	`24`	`source.ts`
`25`	`25`	`^^^^^^`
`26`		`- source.ts support.type.primitive.ts`
	`26`	`+ source.ts meta.type.cast.ts support.type.primitive.ts`
`27`	`27`	`^`
`28`	`28`	`source.ts punctuation.terminator.statement.ts`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ Grammar: TypeScript.tmLanguage`
`45`	`45`	`^`
`46`	`46`	`source.ts meta.class.ts meta.field.declaration.ts`
`47`	`47`	`^`
`48`		`- source.ts meta.class.ts meta.field.declaration.ts meta.object.type.ts punctuation.definition.block.ts`
	`48`	`+ source.ts meta.class.ts meta.field.declaration.ts meta.type.cast.ts meta.object.type.ts punctuation.definition.block.ts`
`49`	`49`	`^`
`50`		`- source.ts meta.class.ts meta.field.declaration.ts meta.object.type.ts punctuation.definition.block.ts`
	`50`	`+ source.ts meta.class.ts meta.field.declaration.ts meta.type.cast.ts meta.object.type.ts punctuation.definition.block.ts`
`51`	`51`	`^`
`52`	`52`	`source.ts meta.class.ts punctuation.terminator.statement.ts`
`53`	`53`	`> public a: string;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage`
`52`	`52`	`^`
`53`	`53`	`source.ts meta.function.ts meta.block.ts`
`54`	`54`	`^^^^^^`
`55`		`- source.ts meta.function.ts meta.block.ts support.type.primitive.ts`
	`55`	`+ source.ts meta.function.ts meta.block.ts meta.type.cast.ts support.type.primitive.ts`
`56`	`56`	`^`
`57`	`57`	`source.ts meta.function.ts meta.block.ts`
`58`	`58`	`^`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,6 @@ Grammar: TypeScript.tmLanguage`
`127`	`127`	`^`
`128`	`128`	`source.ts meta.var.expr.ts`
`129`	`129`	`^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`130`		`- source.ts meta.var.expr.ts entity.name.type.ts`
	`130`	`+ source.ts meta.var.expr.ts meta.type.cast.ts entity.name.type.ts`
`131`	`131`	`^`
`132`	`132`	`source.ts punctuation.terminator.statement.ts`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ Grammar: TypeScript.tmLanguage`
`15`	`15`	`^`
`16`	`16`	`source.ts`
`17`	`17`	`^^^`
`18`		`- source.ts support.type.primitive.ts`
	`18`	`+ source.ts meta.type.cast.ts support.type.primitive.ts`
`19`	`19`	`^`
`20`		`- source.ts`
	`20`	`+ source.ts meta.type.cast.ts`
`21`	`21`	`^^`
`22`	`22`	`source.ts keyword.operator.logical.ts`
`23`	`23`	`^`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage`
`56`	`56`	`^`
`57`	`57`	`source.ts meta.var.expr.ts`
`58`	`58`	`^^^^^`
`59`		`- source.ts meta.var.expr.ts storage.modifier.ts`
	`59`	`+ source.ts meta.var.expr.ts storage.modifier.const.type.ts`
`60`	`60`	`^`
`61`	`61`	`source.ts punctuation.terminator.statement.ts`
`62`	`62`	`>let r2 = {...p} as const;`
`@@ -87,7 +87,7 @@ Grammar: TypeScript.tmLanguage`
`87`	`87`	`^`
`88`	`88`	`source.ts meta.var.expr.ts`
`89`	`89`	`^^^^^`
`90`		`- source.ts meta.var.expr.ts storage.modifier.ts`
	`90`	`+ source.ts meta.var.expr.ts storage.modifier.const.type.ts`
`91`	`91`	`^`
`92`	`92`	`source.ts punctuation.terminator.statement.ts`
`93`	`93`	`>let p1 = { x: 10, y: 20 as const };`
`@@ -134,7 +134,7 @@ Grammar: TypeScript.tmLanguage`
`134`	`134`	`^`
`135`	`135`	`source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts`
`136`	`136`	`^^^^^`
`137`		`- source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts`
	`137`	`+ source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts`
`138`	`138`	`^`
`139`	`139`	`source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts`
`140`	`140`	`^`
`@@ -167,7 +167,7 @@ Grammar: TypeScript.tmLanguage`
`167`	`167`	`^`
`168`	`168`	`source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts`
`169`	`169`	`^^^^^`
`170`		`- source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts`
	`170`	`+ source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts`
`171`	`171`	`^`
`172`	`172`	`source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.separator.comma.ts`
`173`	`173`	`^`
`@@ -185,7 +185,7 @@ Grammar: TypeScript.tmLanguage`
`185`	`185`	`^`
`186`	`186`	`source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts`
`187`	`187`	`^^^^^`
`188`		`- source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts`
	`188`	`+ source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts`
`189`	`189`	`^`
`190`	`190`	`source.ts meta.var.expr.ts meta.objectliteral.ts`
`191`	`191`	`^`