Rename entity.name.class to entity.name.type.class

TypeScript.YAML-tmLanguage

@@ -377,7 +377,7 @@ repository:
     - include: '#class-or-interface-heritage' # Must be before object-name to consume the "extends" keyword.
     - match: '[_$[:alpha:]][_$[:alnum:]]*'
       captures:
-        '0': { name: 'entity.name.class.ts' }
+        '0': { name: 'entity.name.type.class.ts' }
     - include: '#type-parameters' # Must be applied after object-name e.g. interface KeyValuePair<K, V>
     - include: '#class-or-interface-body'
 

TypeScript.YAML-tmTheme

@@ -35,7 +35,7 @@ settings:
 - scope: storage.type.class.jsdoc
   settings: { vsclassificationtype: xml doc comment - name }
 
-- scope: entity.name.class.ts
+- scope: entity.name.type.class.ts
   settings: { vsclassificationtype: class name }
 
 - scope: entity.name.type.module.ts

TypeScript.tmLanguage

@@ -1229,7 +1229,7 @@
               <key>0</key>
               <dict>
                 <key>name</key>
-                <string>entity.name.class.ts</string>
+                <string>entity.name.type.class.ts</string>
               </dict>
             </dict>
           </dict>

TypeScript.tmTheme

@@ -118,7 +118,7 @@
       </dict>
       <dict>
         <key>scope</key>
-        <string>entity.name.class.ts</string>
+        <string>entity.name.type.class.ts</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>

TypeScriptReact.tmLanguage

@@ -1233,7 +1233,7 @@
               <key>0</key>
               <dict>
                 <key>name</key>
-                <string>entity.name.class.tsx</string>
+                <string>entity.name.type.class.tsx</string>
               </dict>
             </dict>
           </dict>

TypeScriptReact.tmTheme

@@ -118,7 +118,7 @@
       </dict>
       <dict>
         <key>scope</key>
-        <string>entity.name.class.tsx</string>
+        <string>entity.name.type.class.tsx</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>

tests/baselines/Abstracts.baseline.txt

@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.class.ts
                 ^^^^^^
-                source.ts meta.class.ts entity.name.class.ts
+                source.ts meta.class.ts entity.name.type.class.ts
                       ^
                       source.ts meta.class.ts
                        ^
@@ -128,7 +128,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
           ^
           source.ts meta.class.ts
            ^^^^^^^
@@ -184,7 +184,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
           ^
           source.ts meta.class.ts
            ^^^^^^^

tests/baselines/Comments.baseline.txt

@@ -559,7 +559,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.class.ts
                 ^
-                source.ts meta.class.ts entity.name.class.ts
+                source.ts meta.class.ts entity.name.type.class.ts
                  ^
                  source.ts meta.class.ts
                   ^^^^^^^
@@ -594,7 +594,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.class.ts
                 ^
-                source.ts meta.class.ts entity.name.class.ts
+                source.ts meta.class.ts entity.name.type.class.ts
                  ^
                  source.ts meta.class.ts
                   ^^^^^^^
@@ -623,7 +623,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^
@@ -658,7 +658,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^^^^^^
@@ -693,7 +693,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^^^^^^
@@ -728,7 +728,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^^^^^^
@@ -763,7 +763,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^^^^^^
@@ -798,7 +798,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^^^^^^
@@ -833,7 +833,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^^^^^^
@@ -880,7 +880,7 @@ Grammar: TypeScript.tmLanguage
                     ^
                     source.ts meta.class.ts
                      ^
-                     source.ts meta.class.ts entity.name.class.ts
+                     source.ts meta.class.ts entity.name.type.class.ts
                       ^
                       source.ts meta.class.ts
                        ^^
@@ -951,7 +951,7 @@ Grammar: TypeScript.tmLanguage
                     ^
                     source.ts meta.class.ts
                      ^
-                     source.ts meta.class.ts entity.name.class.ts
+                     source.ts meta.class.ts entity.name.type.class.ts
                       ^
                       source.ts meta.class.ts
                        ^^
@@ -1029,7 +1029,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^^^^^^^
@@ -1058,7 +1058,7 @@ Grammar: TypeScript.tmLanguage
         ^^
         source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
           ^
-          source.ts meta.class.ts entity.name.class.ts
+          source.ts meta.class.ts entity.name.type.class.ts
            ^
            source.ts meta.class.ts
             ^^^^^^^
@@ -1085,7 +1085,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^^
         source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
           ^^
@@ -1114,7 +1114,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^^^^^^^
@@ -1143,7 +1143,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^^^^^^^
@@ -1174,7 +1174,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^^^^^^^
@@ -1205,7 +1205,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^^^^^^^
@@ -1236,7 +1236,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^^^^^^^
@@ -1267,7 +1267,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^^^^^^^
@@ -1304,7 +1304,7 @@ Grammar: TypeScript.tmLanguage
             ^^
             source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
               ^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                ^^
                source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
                  ^^
@@ -1353,7 +1353,7 @@ Grammar: TypeScript.tmLanguage
             ^^
             source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
               ^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                ^^
                source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
                  ^^
@@ -1407,7 +1407,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^^^^^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
                        ^^
                        source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
                          ^^
@@ -1484,7 +1484,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^^^^^
-           source.ts meta.class.ts entity.name.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
                         ^
@@ -1559,7 +1559,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^^^^^
-           source.ts meta.class.ts entity.name.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
                         ^
@@ -1634,7 +1634,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^^^^^
-           source.ts meta.class.ts entity.name.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
                         ^
@@ -1711,7 +1711,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^^^^^
-           source.ts meta.class.ts entity.name.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
                         ^
@@ -1789,7 +1789,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^^
             source.ts meta.class.ts comment.block.ts punctuation.definition.comment.ts
               ^^
@@ -1866,7 +1866,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.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
              ^^^^^^^^
@@ -1941,7 +1941,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.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
              ^^^^^^^^

tests/baselines/FunctionMethodOverloads.baseline.txt

@@ -580,7 +580,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                 ^
                 source.ts meta.class.ts
                  ^
@@ -1093,7 +1093,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^
@@ -1146,7 +1146,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.class.ts
                 ^
-                source.ts meta.class.ts entity.name.class.ts
+                source.ts meta.class.ts entity.name.type.class.ts
                  ^
                  source.ts meta.class.ts
                   ^

tests/baselines/FunctionMethodParameters.baseline.txt

@@ -384,7 +384,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                 ^
                 source.ts meta.class.ts
                  ^

tests/baselines/FunctionMethodReturnTypes.baseline.txt

@@ -936,7 +936,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                 ^
                 source.ts meta.class.ts
                  ^

tests/baselines/Issue10.baseline.txt

@@ -63,7 +63,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^

tests/baselines/Issue114.baseline.txt

@@ -99,7 +99,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
                ^
                source.ts meta.class.ts
                 ^

tests/baselines/Issue115.baseline.txt

@@ -24,7 +24,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
           ^
           source.ts meta.class.ts
            ^

tests/baselines/Issue119.baseline.txt

@@ -17,7 +17,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/Issue133.baseline.txt

@@ -14,7 +14,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^

tests/baselines/Issue142.baseline.txt

@@ -15,7 +15,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/Issue143.baseline.txt

@@ -96,7 +96,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                   ^
                   source.ts meta.class.ts
                    ^
@@ -313,7 +313,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^^^^^^^^^^^^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                           ^
                           source.ts meta.class.ts
                            ^

tests/baselines/Issue148.baseline.txt

@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
            ^
            source.ts meta.class.ts
             ^

tests/baselines/Issue153.baseline.txt

@@ -135,7 +135,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
              ^
              source.ts meta.class.ts
               ^

tests/baselines/Issue154.baseline.txt

@@ -21,7 +21,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                ^
                source.ts meta.class.ts
                 ^
@@ -95,7 +95,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                 ^
                 source.ts meta.class.ts
                  ^

tests/baselines/Issue156.baseline.txt

@@ -16,7 +16,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
            ^
            source.ts meta.class.ts
             ^

tests/baselines/Issue158.baseline.txt

@@ -23,7 +23,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
            ^^
            source.ts meta.class.ts
 >{

tests/baselines/Issue171.baseline.txt

@@ -34,7 +34,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/Issue183.baseline.txt

@@ -32,7 +32,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
               ^^
               source.ts meta.class.ts
 >{

tests/baselines/Issue191.baseline.txt

@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^
@@ -226,7 +226,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^
-       source.ts meta.class.ts entity.name.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
              ^

tests/baselines/Issue197.baseline.txt

@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
               ^
               source.ts meta.class.ts
                ^^^^^^^^^^^
-               source.ts meta.class.ts entity.name.class.ts
+               source.ts meta.class.ts entity.name.type.class.ts
                           ^^
                           source.ts meta.class.ts
                             ^

tests/baselines/Issue202.baseline.txt

@@ -20,7 +20,7 @@ Grammar: TypeScriptReact.tmLanguage
           ^
           source.tsx meta.class.tsx
            ^^^^
-           source.tsx meta.class.tsx entity.name.class.tsx
+           source.tsx meta.class.tsx entity.name.type.class.tsx
                ^
                source.tsx meta.class.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx
                 ^
@@ -62,7 +62,7 @@ Grammar: TypeScriptReact.tmLanguage
           ^
           source.tsx meta.class.tsx
            ^^^^^
-           source.tsx meta.class.tsx entity.name.class.tsx
+           source.tsx meta.class.tsx entity.name.type.class.tsx
                 ^
                 source.tsx meta.class.tsx
                  ^
@@ -104,7 +104,7 @@ Grammar: TypeScriptReact.tmLanguage
       ^
       source.tsx meta.class.tsx
        ^^^^^^^^
-       source.tsx meta.class.tsx entity.name.class.tsx
+       source.tsx meta.class.tsx entity.name.type.class.tsx
                ^
                source.tsx meta.class.tsx
                 ^

tests/baselines/Issue206.baseline.txt

@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^
@@ -67,7 +67,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^
@@ -82,7 +82,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^

tests/baselines/Issue208.baseline.txt

@@ -105,7 +105,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
               ^
               source.ts meta.class.ts
                ^

tests/baselines/Issue216.baseline.txt

@@ -19,7 +19,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
              ^^
              source.ts meta.class.ts
 >{

tests/baselines/Issue217.baseline.txt

@@ -23,7 +23,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^^^^^^^^^^^^^^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                             ^
                             source.ts meta.class.ts
                              ^
@@ -114,7 +114,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^^^^^^^^^^^^^^^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                              ^
                              source.ts meta.class.ts
                               ^

tests/baselines/Issue218.baseline.txt

@@ -16,7 +16,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/Issue221.baseline.txt

@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                          ^
                          source.ts meta.class.ts
                           ^

tests/baselines/Issue235.baseline.txt

@@ -16,7 +16,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/Issue236.baseline.txt

@@ -23,7 +23,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
            ^
            source.ts meta.class.ts
             ^

tests/baselines/Issue247.baseline.txt

@@ -33,7 +33,7 @@ Grammar: TypeScriptReact.tmLanguage
       ^
       source.tsx meta.class.tsx
        ^^^^
-       source.tsx meta.class.tsx entity.name.class.tsx
+       source.tsx meta.class.tsx entity.name.type.class.tsx
            ^
            source.tsx meta.class.tsx
             ^

tests/baselines/Issue248.baseline.txt

@@ -46,7 +46,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -146,7 +146,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -246,7 +246,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -346,7 +346,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -446,7 +446,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -546,7 +546,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^

tests/baselines/Issue250.baseline.txt

@@ -45,7 +45,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^^^^^^^^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                       ^
                       source.ts meta.class.ts
                        ^^^^^^^

tests/baselines/Issue280.baseline.txt

@@ -41,7 +41,7 @@ Grammar: TypeScriptReact.tmLanguage
       ^
       source.tsx meta.class.tsx
        ^
-       source.tsx meta.class.tsx entity.name.class.tsx
+       source.tsx meta.class.tsx entity.name.type.class.tsx
         ^
         source.tsx meta.class.tsx
          ^

tests/baselines/Issue283.baseline.txt

@@ -82,7 +82,7 @@ Grammar: TypeScriptReact.tmLanguage
                      ^
                      source.tsx meta.class.tsx
                       ^^^^
-                      source.tsx meta.class.tsx entity.name.class.tsx
+                      source.tsx meta.class.tsx entity.name.type.class.tsx
                           ^
                           source.tsx meta.class.tsx
                            ^^^^^^^

tests/baselines/Issue305.baseline.txt

@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.class.ts
                 ^^^^
-                source.ts meta.class.ts entity.name.class.ts
+                source.ts meta.class.ts entity.name.type.class.ts
                     ^
                     source.ts meta.class.ts
                      ^

tests/baselines/Issue307.baseline.txt

@@ -19,7 +19,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
            ^
            source.ts meta.class.ts
             ^

tests/baselines/Issue32.baseline.txt

@@ -43,7 +43,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^^^^^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
                        ^
                        source.ts meta.class.ts punctuation.definition.block.ts
 >	currentData: Data;
@@ -91,7 +91,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                ^
                source.ts meta.class.ts
                 ^^^^^^^^^^

tests/baselines/Issue32.txt

@@ -33,7 +33,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^^^^^
  [5, 1]: source.ts meta.class.ts storage.type.interface.ts 
            ^^^^^^^^^^^^
-           [5, 11]: source.ts meta.class.ts entity.name.class.ts 
+           [5, 11]: source.ts meta.class.ts entity.name.type.class.ts 
 >	currentData: Data;
   ^^^^^^^^^^^
   [6, 2]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts 

tests/baselines/Issue335.baseline.txt

@@ -61,7 +61,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -155,7 +155,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -247,7 +247,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^
@@ -399,7 +399,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
          ^
          source.ts meta.class.ts
           ^

tests/baselines/Issue37.baseline.txt

@@ -176,7 +176,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
              ^^
              source.ts meta.class.ts
                ^
@@ -220,7 +220,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^^^^^^^^^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                        ^^
                        source.ts meta.class.ts
                          ^
@@ -562,7 +562,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^
@@ -621,7 +621,7 @@ Grammar: TypeScript.tmLanguage
                  ^
                  source.ts meta.block.ts meta.class.ts
                   ^^^^
-                  source.ts meta.block.ts meta.class.ts entity.name.class.ts
+                  source.ts meta.block.ts meta.class.ts entity.name.type.class.ts
                       ^
                       source.ts meta.block.ts meta.class.ts
                        ^

tests/baselines/Issue37.txt

@@ -96,7 +96,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^
  [9, 1]: source.ts meta.class.ts storage.type.class.ts 
        ^^^^^^
-       [9, 7]: source.ts meta.class.ts entity.name.class.ts 
+       [9, 7]: source.ts meta.class.ts entity.name.type.class.ts 
 >	static functioname(){
   ^^^^^^
   [10, 2]: source.ts meta.class.ts storage.modifier.ts 
@@ -187,7 +187,7 @@ Grammar: TypeScript.tmLanguage
             ^^^^^
             [52, 12]: source.ts meta.block.ts meta.class.ts storage.type.class.ts 
                   ^^^^
-                  [52, 18]: source.ts meta.block.ts meta.class.ts entity.name.class.ts 
+                  [52, 18]: source.ts meta.block.ts meta.class.ts entity.name.type.class.ts 
 >        public parent: Cell;
          ^^^^^^
          [53, 9]: source.ts meta.block.ts meta.class.ts storage.modifier.ts 

tests/baselines/Issue44.baseline.txt

@@ -23,7 +23,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^^^^^^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
                         ^
                         source.ts meta.class.ts
                          ^

tests/baselines/Issue44.txt

@@ -19,7 +19,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^^^^^
  [2, 1]: source.ts meta.class.ts storage.type.interface.ts 
            ^^^^^^^^^^^^^
-           [2, 11]: source.ts meta.class.ts entity.name.class.ts 
+           [2, 11]: source.ts meta.class.ts entity.name.type.class.ts 
 >  testvar: string;
    ^^^^^^^
    [3, 3]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts 

tests/baselines/Issue59.baseline.txt

@@ -14,7 +14,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/Issue65.baseline.txt

@@ -19,7 +19,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
           ^^^
           source.ts meta.class.ts
              ^

tests/baselines/Issue66.baseline.txt

@@ -61,7 +61,7 @@ Grammar: TypeScriptReact.tmLanguage
       ^
       source.tsx meta.class.tsx
        ^^^^^
-       source.tsx meta.class.tsx entity.name.class.tsx
+       source.tsx meta.class.tsx entity.name.type.class.tsx
             ^
             source.tsx meta.class.tsx
              ^

tests/baselines/Issue82.baseline.txt

@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
           ^
           source.ts meta.class.ts
            ^

tests/baselines/Issue89.baseline.txt

@@ -38,7 +38,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                ^
                source.ts meta.class.ts
                 ^^^^^^^
@@ -92,7 +92,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                ^
                source.ts meta.class.ts
                 ^^^^^^^^^^
@@ -143,7 +143,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts
               ^
-              source.ts meta.class.ts entity.name.class.ts
+              source.ts meta.class.ts entity.name.type.class.ts
                ^
                source.ts meta.class.ts
                 ^^^^^^^
@@ -196,7 +196,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                 ^
                 source.ts meta.class.ts
                  ^^^^^^^

tests/baselines/Issue89.txt

@@ -32,7 +32,7 @@ Grammar: TypeScript.tmLanguage
         ^^^^^
         [1, 8]: source.ts meta.class.ts storage.type.class.ts 
               ^
-              [1, 14]: source.ts meta.class.ts entity.name.class.ts 
+              [1, 14]: source.ts meta.class.ts entity.name.type.class.ts 
                 ^^^^^^^
                 [1, 16]: source.ts meta.class.ts storage.modifier.ts 
                           ^^
@@ -54,7 +54,7 @@ Grammar: TypeScript.tmLanguage
 >
 >export class D implements/**/  F extends /**/G  {
               ^
-              [7, 14]: source.ts meta.class.ts entity.name.class.ts 
+              [7, 14]: source.ts meta.class.ts entity.name.type.class.ts 
                 ^^^^^^^^^^
                 [7, 16]: source.ts meta.class.ts storage.modifier.ts 
                               ^^
@@ -75,7 +75,7 @@ Grammar: TypeScript.tmLanguage
 >
 >export class E extends /**/H  implements/**/ One, Two, Three{
               ^
-              [12, 14]: source.ts meta.class.ts entity.name.class.ts 
+              [12, 14]: source.ts meta.class.ts entity.name.type.class.ts 
                 ^^^^^^^
                 [12, 16]: source.ts meta.class.ts storage.modifier.ts 
                             ^
@@ -102,7 +102,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^
  [17, 1]: source.ts meta.class.ts storage.type.class.ts 
        ^^^^^^^^^
-       [17, 7]: source.ts meta.class.ts entity.name.class.ts 
+       [17, 7]: source.ts meta.class.ts entity.name.type.class.ts 
                  ^^^^^^^
                  [17, 17]: source.ts meta.class.ts storage.modifier.ts 
                          ^^^^^^

tests/baselines/ParameterProperties.baseline.txt

@@ -17,7 +17,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/SyntacticallyIncorrectStrings.baseline.txt

@@ -27,7 +27,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^^^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
                 ^
                 source.ts meta.class.ts
                  ^

tests/baselines/TsxSamples.baseline.txt

@@ -69,7 +69,7 @@ Grammar: TypeScriptReact.tmLanguage
       ^
       source.tsx meta.class.tsx
        ^^^^^^^^^^^
-       source.tsx meta.class.tsx entity.name.class.tsx
+       source.tsx meta.class.tsx entity.name.type.class.tsx
                   ^
                   source.tsx meta.class.tsx
                    ^^^^^^^

tests/baselines/arrow.baseline.txt

@@ -53,7 +53,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/destructuringWithDefaults.baseline.txt

@@ -38,7 +38,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^^^^^^^^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
                    ^
                    source.ts meta.class.ts
                     ^

tests/baselines/generator.baseline.txt

@@ -203,7 +203,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^

tests/baselines/pr48_noSemiColon.baseline.txt

@@ -31,7 +31,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^^^^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
            ^
            source.ts meta.class.ts
             ^

tests/baselines/readonly.baseline.txt

@@ -22,7 +22,7 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts
            ^
-           source.ts meta.class.ts entity.name.class.ts
+           source.ts meta.class.ts entity.name.type.class.ts
             ^
             source.ts meta.class.ts
              ^
@@ -83,7 +83,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts
        ^
-       source.ts meta.class.ts entity.name.class.ts
+       source.ts meta.class.ts entity.name.type.class.ts
         ^
         source.ts meta.class.ts
          ^