Scope functions, variables, methods, properties, objects, constants

TypeScript.YAML-tmLanguage

@@ -177,6 +177,7 @@ repository:
     - include: '#operators'
     - include: '#support-objects'
     - include: '#function-call'
+    - include: '#identifiers'
     - include: '#paren-expression'
     - include: '#punctuation-comma'
     - include: '#punctuation-accessor'
@@ -1209,10 +1210,10 @@ repository:
         '4': { name: support.function.dom.ts }
 
   function-call:
-    #TODO: Scope function names and method names
-    begin: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(<([^<>]|\<[^<>]+\>)+>\s*)?\()'
+    begin: (?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(<([^<>]|\<[^<>]+\>)+>\s*)?\()
     beginCaptures:
-      '1': { name: variable.function.ts }
+      '1': { name: punctuation.accessor.ts }
+      '2': { name: entity.name.function.ts }
     end: (?=\()
     patterns:
     - include: '#comment'
@@ -1227,6 +1228,52 @@ repository:
       - include: '#type'
       - include: '#punctuation-comma'
 
+  identifiers:
+    patterns:
+    # object properties
+    - match: |-
+        (?x)(\.)\s*(?:
+          ([[:upper:]][_$[:digit:][:upper:]]*) |
+          ([_$[:alpha:]][_$[:alnum:]]*)
+        )(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)
+      captures:
+        '1': { name: punctuation.accessor.ts }
+        '2': { name: constant.other.object.property.ts }
+        '3': { name: variable.other.object.property.ts }
+    # function and method assignment
+    - match: (?x)(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\s*=\s*(
+        (async\s+)|(function\s+)|
+        ([_$[:alpha:]][_$[:alnum:]]*\s*=>)|
+        ((<([^<>]|\<[^<>]+\>)+>\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)))
+      captures:
+        '1': { name: punctuation.accessor.ts }
+        '2': { name: entity.name.function.ts }
+    # const properties
+    - match: (\.)\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])
+      captures:
+        '1': { name: punctuation.accessor.ts }
+        '2': { name: constant.other.property.ts }
+    # properties
+    - match: (\.)\s*([_$[:alpha:]][_$[:alnum:]]*)
+      captures:
+        '1': { name: punctuation.accessor.ts }
+        '2': { name: variable.other.property.ts }
+    # objects
+    - match: |-
+        (?x)(?:
+          ([[:upper:]][_$[:digit:][:upper:]]*) |
+          ([_$[:alpha:]][_$[:alnum:]]*)
+        )(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)
+      captures:
+        '1': { name: constant.other.object.ts }
+        '2': { name: variable.other.object.ts }
+    # const
+    - name: constant.other.ts
+      match: ([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])
+    # vars
+    - name: variable.other.readwrite.ts
+      match: '[_$[:alpha:]][_$[:alnum:]]*'
+
   cast:
     name: cast.expr.ts
     # We need to differentiate between the relational '<' operator and the beginning of a type assertion/cast using the surrounding context.
@@ -1521,7 +1568,7 @@ repository:
     name: string.template.ts
     begin: '([_$[:alpha:]][_$[:alnum:]]*)?(`)'
     beginCaptures:
-      '1': { name: variable.function.tagged-template.ts }
+      '1': { name: entity.name.function.tagged-template.ts }
       '2': { name: punctuation.definition.string.template.begin.ts }
     end: '`'
     endCaptures:

TypeScript.tmLanguage

@@ -559,6 +559,10 @@
             <key>include</key>
             <string>#function-call</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#identifiers</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#paren-expression</string>
@@ -3364,13 +3368,18 @@
       <key>function-call</key>
       <dict>
         <key>begin</key>
-        <string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
+        <string>(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>variable.function.ts</string>
+            <string>punctuation.accessor.ts</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>entity.name.function.ts</string>
           </dict>
         </dict>
         <key>end</key>
@@ -3418,6 +3427,120 @@
           </dict>
         </array>
       </dict>
+      <key>identifiers</key>
+      <dict>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>match</key>
+            <string>(?x)(\.)\s*(?:
+  ([[:upper:]][_$[:digit:][:upper:]]*) |
+  ([_$[:alpha:]][_$[:alnum:]]*)
+)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.ts</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>constant.other.object.property.ts</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>variable.other.object.property.ts</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(?x)(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\s*=\s*( (async\s+)|(function\s+)| ([_$[:alpha:]][_$[:alnum:]]*\s*=&gt;)| ((&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)))</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.ts</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>entity.name.function.ts</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(\.)\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.ts</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>constant.other.property.ts</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(\.)\s*([_$[:alpha:]][_$[:alnum:]]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.ts</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.other.property.ts</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(?x)(?:
+  ([[:upper:]][_$[:digit:][:upper:]]*) |
+  ([_$[:alpha:]][_$[:alnum:]]*)
+)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>constant.other.object.ts</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.other.object.ts</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>constant.other.ts</string>
+            <key>match</key>
+            <string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>variable.other.readwrite.ts</string>
+            <key>match</key>
+            <string>[_$[:alpha:]][_$[:alnum:]]*</string>
+          </dict>
+        </array>
+      </dict>
       <key>cast</key>
       <dict>
         <key>name</key>
@@ -4289,7 +4412,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>variable.function.tagged-template.ts</string>
+            <string>entity.name.function.tagged-template.ts</string>
           </dict>
           <key>2</key>
           <dict>

TypeScriptReact.tmLanguage

@@ -563,6 +563,10 @@
             <key>include</key>
             <string>#function-call</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#identifiers</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#paren-expression</string>
@@ -3368,13 +3372,18 @@
       <key>function-call</key>
       <dict>
         <key>begin</key>
-        <string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
+        <string>(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>variable.function.tsx</string>
+            <string>punctuation.accessor.tsx</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>entity.name.function.tsx</string>
           </dict>
         </dict>
         <key>end</key>
@@ -3422,6 +3431,120 @@
           </dict>
         </array>
       </dict>
+      <key>identifiers</key>
+      <dict>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>match</key>
+            <string>(?x)(\.)\s*(?:
+  ([[:upper:]][_$[:digit:][:upper:]]*) |
+  ([_$[:alpha:]][_$[:alnum:]]*)
+)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>constant.other.object.property.tsx</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>variable.other.object.property.tsx</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(?x)(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\s*=\s*( (async\s+)|(function\s+)| ([_$[:alpha:]][_$[:alnum:]]*\s*=&gt;)| ((&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)))</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>entity.name.function.tsx</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(\.)\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>constant.other.property.tsx</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(\.)\s*([_$[:alpha:]][_$[:alnum:]]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.accessor.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.other.property.tsx</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(?x)(?:
+  ([[:upper:]][_$[:digit:][:upper:]]*) |
+  ([_$[:alpha:]][_$[:alnum:]]*)
+)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>constant.other.object.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.other.object.tsx</string>
+              </dict>
+            </dict>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>constant.other.tsx</string>
+            <key>match</key>
+            <string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>variable.other.readwrite.tsx</string>
+            <key>match</key>
+            <string>[_$[:alpha:]][_$[:alnum:]]*</string>
+          </dict>
+        </array>
+      </dict>
       <key>cast</key>
       <dict>
         <key>patterns</key>
@@ -4271,7 +4394,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>variable.function.tagged-template.tsx</string>
+            <string>entity.name.function.tagged-template.tsx</string>
           </dict>
           <key>2</key>
           <dict>

tests/baselines/Abstracts.baseline.txt

@@ -88,7 +88,7 @@ Grammar: TypeScript.tmLanguage
                                          ^
                                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
                                           ^^^
-                                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
                                              ^
                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
                                               ^
@@ -261,11 +261,11 @@ Grammar: TypeScript.tmLanguage
                     source.ts punctuation.terminator.statement.ts
 >cow.makeSound();
  ^^^
- source.ts
+ source.ts variable.other.object.ts
     ^
     source.ts punctuation.accessor.ts
      ^^^^^^^^^
-     source.ts variable.function.ts
+     source.ts entity.name.function.ts
               ^
               source.ts meta.brace.round.ts
                ^

tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

@@ -155,7 +155,7 @@ Grammar: TypeScript.tmLanguage
             ^
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
              ^^^^^^^
-             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
+             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts variable.other.object.ts
                     ^
                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                      ^^^^^
@@ -168,8 +168,10 @@ Grammar: TypeScript.tmLanguage
                                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
                                    ^^^
                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts keyword.operator.comparison.ts
-                                      ^^^^^^^^^^^^^
+                                      ^
                                       source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
+                                       ^^^^^^^^^^^^
+                                       source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts variable.other.readwrite.ts
                                                    ^
                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                                                     ^
@@ -177,8 +179,10 @@ Grammar: TypeScript.tmLanguage
                                                      ^
                                                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
 >            domNode.style.display = desiredValue;
- ^^^^^^^^^^^^^^^^^^^
+ ^^^^^^^^^^^^
  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
+             ^^^^^^^
+             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts variable.other.object.ts
                     ^
                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                      ^^^^^
@@ -191,8 +195,10 @@ Grammar: TypeScript.tmLanguage
                                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
                                    ^
                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts
-                                    ^^^^^^^^^^^^^
+                                    ^
                                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
+                                     ^^^^^^^^^^^^
+                                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
                                                  ^
                                                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.terminator.statement.ts
 >        }
@@ -275,8 +281,12 @@ Grammar: TypeScript.tmLanguage
         source.ts meta.function.ts meta.block.ts meta.brace.round.ts
          ^^^^^^
          source.ts meta.function.ts meta.block.ts keyword.operator.typeof.ts
-               ^^^
+               ^
                source.ts meta.function.ts meta.block.ts
+                ^
+                source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
+                 ^
+                 source.ts meta.function.ts meta.block.ts
                   ^^^
                   source.ts meta.function.ts meta.block.ts keyword.operator.comparison.ts
                      ^
@@ -302,8 +312,8 @@ Grammar: TypeScript.tmLanguage
                source.ts meta.function.ts meta.block.ts meta.block.ts
                 ^
                 source.ts meta.function.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts
-                 ^^
-                 source.ts meta.function.ts meta.block.ts meta.block.ts
+                 ^
+                 source.ts meta.function.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
 >    }
  ^^^^
  source.ts meta.function.ts meta.block.ts meta.block.ts
@@ -357,8 +367,10 @@ Grammar: TypeScript.tmLanguage
                                  source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts
                                        ^
                                        source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts
-                                        ^^
+                                        ^
                                         source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                         ^
+                                         source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
 >        return f("hello world")
  ^^^^^^^^
  source.ts meta.function.ts meta.block.ts meta.block.ts
@@ -367,7 +379,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.function.ts meta.block.ts meta.block.ts
                 ^
-                source.ts meta.function.ts meta.block.ts meta.block.ts variable.function.ts
+                source.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts
                  ^
                  source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts
                   ^

tests/baselines/ArrowFunctionInsideTypeAssertion.txt

@@ -77,8 +77,8 @@ Grammar: TypeScript.tmLanguage
                                  [18, 33]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts 
                                        ^
                                        [18, 39]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts 
-                                        ^^
-                                        [18, 41]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+                                         ^
+                                         [18, 41]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
 >        return f("hello world")
 >    }
 >}

tests/baselines/FunctionMethodParameters.baseline.txt

@@ -362,8 +362,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.function.ts meta.block.ts
      ^^^^^^
      source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
-           ^^^
+           ^
            source.ts meta.function.ts meta.block.ts
+            ^^
+            source.ts meta.function.ts meta.block.ts variable.other.object.ts
               ^
               source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                ^^^^^^
@@ -718,8 +720,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
          ^^^^^^
          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
-               ^^^
+               ^
                source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                ^^
+                source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
                   ^
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
                    ^^^^^^

tests/baselines/Issue10.baseline.txt

@@ -34,15 +34,21 @@ Grammar: TypeScript.tmLanguage
              ^^
              source.ts meta.block.ts
 >    A,
- ^^^^^
+ ^^^^
  source.ts meta.block.ts
+     ^
+     source.ts meta.block.ts constant.other.ts
       ^
       source.ts meta.block.ts punctuation.separator.comma.ts
        ^^
        source.ts meta.block.ts
 >    B
- ^^^^^^^
+ ^^^^
  source.ts meta.block.ts
+     ^
+     source.ts meta.block.ts constant.other.ts
+      ^^
+      source.ts meta.block.ts
 >}
  ^
  source.ts meta.block.ts punctuation.definition.block.ts
@@ -139,11 +145,11 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
       ^^^^^
-      source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
+      source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts variable.other.object.ts
            ^
            source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts punctuation.accessor.ts
             ^
-            source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
+            source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts constant.other.property.ts
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
               ^

tests/baselines/Issue11.baseline.txt

@@ -27,16 +27,20 @@ Grammar: TypeScript.tmLanguage
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
              ^
              source.ts punctuation.terminator.statement.ts
-              ^^
+              ^
               source.ts
+               ^
+               source.ts variable.other.readwrite.ts
                 ^
                 source.ts keyword.operator.relational.ts
                  ^^
                  source.ts constant.numeric.decimal.ts
                    ^
                    source.ts punctuation.terminator.statement.ts
-                    ^^
+                    ^
                     source.ts
+                     ^
+                     source.ts variable.other.readwrite.ts
                       ^^
                       source.ts keyword.operator.increment.ts
                         ^

tests/baselines/Issue112.baseline.txt

@@ -26,19 +26,23 @@ Grammar: TypeScript.tmLanguage
                            ^
                            source.ts meta.brace.round.ts
                             ^^^^^^^^
-                            source.ts
+                            source.ts variable.other.object.ts
                                     ^
                                     source.ts punctuation.accessor.ts
                                      ^^^^
                                      source.ts support.variable.property.dom.ts
                                          ^
                                          source.ts punctuation.separator.comma.ts
-                                          ^^^^^^^^^^^^^
+                                          ^
                                           source.ts
+                                           ^^^^^^^^^^^^
+                                           source.ts variable.other.readwrite.ts
                                                        ^
                                                        source.ts punctuation.separator.comma.ts
-                                                        ^^^^^^^^^^^^^^^^^^^
+                                                        ^
                                                         source.ts
+                                                         ^^^^^^^^^^^^^^^^^^
+                                                         source.ts variable.other.readwrite.ts
                                                                            ^
                                                                            source.ts meta.brace.round.ts
                                                                             ^
@@ -47,11 +51,11 @@ Grammar: TypeScript.tmLanguage
                                                                              source.ts
 >angular.module('app')
  ^^^^^^^
- source.ts
+ source.ts variable.other.object.ts
         ^
         source.ts punctuation.accessor.ts
          ^^^^^^
-         source.ts variable.function.ts
+         source.ts entity.name.function.ts
                ^
                source.ts meta.brace.round.ts
                 ^
@@ -70,7 +74,7 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts punctuation.accessor.ts
       ^^^^^^^^^^^^
-      source.ts
+      source.ts variable.other.object.property.ts
                   ^
                   source.ts punctuation.accessor.ts
                    ^^^^^^
@@ -78,7 +82,7 @@ Grammar: TypeScript.tmLanguage
                          ^
                          source.ts meta.brace.round.ts
                           ^^^^^^^^^^
-                          source.ts
+                          source.ts variable.other.object.ts
                                     ^
                                     source.ts punctuation.accessor.ts
                                      ^^
@@ -95,7 +99,7 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts punctuation.accessor.ts
       ^^^^^^^^^^^^^^^^^^^
-      source.ts
+      source.ts variable.other.object.property.ts
                          ^
                          source.ts punctuation.accessor.ts
                           ^^^^^^
@@ -103,7 +107,7 @@ Grammar: TypeScript.tmLanguage
                                 ^
                                 source.ts meta.brace.round.ts
                                  ^^^^^^^^^^
-                                 source.ts
+                                 source.ts variable.other.readwrite.ts
                                            ^
                                            source.ts meta.brace.round.ts
                                             ^

tests/baselines/Issue124.baseline.txt

@@ -151,13 +151,13 @@ Grammar: TypeScript.tmLanguage
                                 ^^
                                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
                                   ^^^^^^^^^^^^^^^^^^^^
-                                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts
+                                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts constant.other.ts
                                                       ^
                                                       source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
                                                        ^^
                                                        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
                                                          ^^^^^^^^^^
-                                                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts
+                                                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts variable.other.readwrite.ts
                                                                    ^
                                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
                                                                     ^^^^^^^^^^^^^^^
@@ -180,16 +180,22 @@ Grammar: TypeScript.tmLanguage
            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
             ^
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-             ^^^
+             ^
              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+              ^
+              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+               ^
+               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                 ^
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts
                  ^
                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                   ^
                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
-                   ^^
-                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                   ^
+                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                    ^
+                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                      ^^
                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts
                        ^
@@ -226,8 +232,12 @@ Grammar: TypeScript.tmLanguage
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
              ^
              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-              ^^^^^^
+              ^
               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+               ^^^^
+               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                   ^
+                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                     ^^^
                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts
                        ^

tests/baselines/Issue124.txt

@@ -58,8 +58,8 @@ Grammar: TypeScript.tmLanguage
 >var newVar = a ? (b == `hello`) : true;
      ^^^^^^
      [10, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
-             ^^^
-             [10, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+              ^
+              [10, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
                 ^
                 [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts 
                   ^
@@ -70,8 +70,8 @@ Grammar: TypeScript.tmLanguage
 >var debArch = arch === 'x64' ? 'amd64' : 'i386';
      ^^^^^^^
      [12, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
-              ^^^^^^
-              [12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+               ^^^^
+               [12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
                     ^^^
                     [12, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts 
                         ^

tests/baselines/Issue131.baseline.txt

@@ -11,18 +11,22 @@ Grammar: TypeScript.tmLanguage
 -----------------------------------
 >foo.namespace
  ^^^
- source.ts
+ source.ts variable.other.object.ts
     ^
     source.ts punctuation.accessor.ts
-     ^^^^^^^^^^^
-     source.ts
+     ^^^^^^^^^
+     source.ts variable.other.property.ts
+              ^^
+              source.ts
 >foo.any
  ^^^
- source.ts
+ source.ts variable.other.object.ts
     ^
     source.ts punctuation.accessor.ts
-     ^^^^^
-     source.ts
+     ^^^
+     source.ts variable.other.property.ts
+        ^^
+        source.ts
 >var number, string;
  ^^^
  source.ts meta.var.expr.ts storage.type.ts
@@ -41,8 +45,10 @@ Grammar: TypeScript.tmLanguage
                     ^^
                     source.ts
 >number
- ^^^^^^^^
- source.ts
+ ^^^^^^
+ source.ts variable.other.readwrite.ts
+       ^^
+       source.ts
 >string
- ^^^^^^^
- source.ts
+ ^^^^^^
+ source.ts variable.other.readwrite.ts

tests/baselines/Issue142.baseline.txt

@@ -51,7 +51,7 @@ Grammar: TypeScript.tmLanguage
          ^
          source.ts meta.class.ts meta.field.declaration.ts punctuation.accessor.ts
           ^^^^
-          source.ts meta.class.ts meta.field.declaration.ts variable.function.ts
+          source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts
               ^
               source.ts meta.class.ts meta.field.declaration.ts meta.brace.round.ts
                ^^^^
@@ -59,7 +59,7 @@ Grammar: TypeScript.tmLanguage
                    ^
                    source.ts meta.class.ts meta.field.declaration.ts punctuation.accessor.ts
                     ^^^
-                    source.ts meta.class.ts meta.field.declaration.ts
+                    source.ts meta.class.ts meta.field.declaration.ts variable.other.object.property.ts
                        ^
                        source.ts meta.class.ts meta.field.declaration.ts punctuation.accessor.ts
                         ^^^^^^

tests/baselines/Issue143.baseline.txt

@@ -67,7 +67,7 @@ Grammar: TypeScript.tmLanguage
  ^
  source.ts meta.decorator.ts punctuation.decorator.ts
   ^^^^^^^^^
-  source.ts meta.decorator.ts variable.function.ts
+  source.ts meta.decorator.ts entity.name.function.ts
            ^
            source.ts meta.decorator.ts meta.brace.round.ts
             ^
@@ -126,7 +126,7 @@ Grammar: TypeScript.tmLanguage
    ^
    source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts
     ^^^^^^^^^^^^
-    source.ts meta.class.ts meta.decorator.ts variable.function.ts
+    source.ts meta.class.ts meta.decorator.ts entity.name.function.ts
                 ^
                 source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts
                  ^
@@ -186,8 +186,10 @@ Grammar: TypeScript.tmLanguage
                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts
                          ^
                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts
-                          ^^^^
+                          ^
                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                           ^^^
+                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
                               ^
                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts
                                ^
@@ -207,7 +209,7 @@ Grammar: TypeScript.tmLanguage
                                                          ^
                                                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
                                                           ^^^^^^^^^^^^^^
-                                                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                                                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
                                                                         ^^
                                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.increment.ts
                                                                           ^
@@ -232,7 +234,7 @@ Grammar: TypeScript.tmLanguage
  ^
  source.ts meta.decorator.ts punctuation.decorator.ts
   ^^^^^^^^^
-  source.ts meta.decorator.ts variable.function.ts
+  source.ts meta.decorator.ts entity.name.function.ts
            ^
            source.ts meta.decorator.ts meta.brace.round.ts
             ^
@@ -289,7 +291,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts
                 ^^^^^^^^^^^
-                source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts
+                source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts variable.other.readwrite.ts
                            ^
                            source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts
                             ^^

tests/baselines/Issue148.baseline.txt

@@ -40,7 +40,7 @@ Grammar: TypeScript.tmLanguage
          ^
          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts
           ^^^^^^
-          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts
+          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts variable.other.readwrite.ts
                 ^
                 source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts
                  ^^^^^^^
@@ -65,7 +65,7 @@ Grammar: TypeScript.tmLanguage
          ^
          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts
           ^^^^^^
-          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts variable.function.ts
+          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts entity.name.function.ts
                 ^
                 source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts
                  ^
@@ -100,7 +100,7 @@ Grammar: TypeScript.tmLanguage
          ^
          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts
           ^^^^^^
-          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts variable.function.ts
+          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts entity.name.function.ts
                 ^
                 source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts
                  ^

tests/baselines/Issue152.baseline.txt

@@ -36,8 +36,10 @@ Grammar: TypeScript.tmLanguage
          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
           ^
           source.ts punctuation.terminator.statement.ts
-           ^^
+           ^
            source.ts
+            ^
+            source.ts variable.other.readwrite.ts
              ^
              source.ts keyword.operator.relational.ts
               ^
@@ -47,7 +49,7 @@ Grammar: TypeScript.tmLanguage
                  ^
                  source.ts punctuation.terminator.statement.ts
                   ^
-                  source.ts
+                  source.ts variable.other.readwrite.ts
                    ^^
                    source.ts keyword.operator.increment.ts
                      ^
@@ -59,8 +61,12 @@ Grammar: TypeScript.tmLanguage
                         ^^
                         source.ts meta.block.ts
 >    node = 234;
- ^^^^^^^^^
+ ^^^^
  source.ts meta.block.ts
+     ^^^^
+     source.ts meta.block.ts variable.other.readwrite.ts
+         ^
+         source.ts meta.block.ts
           ^
           source.ts meta.block.ts keyword.operator.assignment.ts
            ^
@@ -75,12 +81,16 @@ Grammar: TypeScript.tmLanguage
  ^^
  source.ts meta.block.ts
 >    node.a = 122;
- ^^^^^^^^
+ ^^^^
  source.ts meta.block.ts
+     ^^^^
+     source.ts meta.block.ts variable.other.object.ts
          ^
          source.ts meta.block.ts punctuation.accessor.ts
-          ^^
-          source.ts meta.block.ts
+          ^
+          source.ts meta.block.ts variable.other.property.ts
+           ^
+           source.ts meta.block.ts
             ^
             source.ts meta.block.ts keyword.operator.assignment.ts
              ^
@@ -92,12 +102,16 @@ Grammar: TypeScript.tmLanguage
                   ^^
                   source.ts meta.block.ts
 >    node.b += 122;
- ^^^^^^^^
+ ^^^^
  source.ts meta.block.ts
+     ^^^^
+     source.ts meta.block.ts variable.other.object.ts
          ^
          source.ts meta.block.ts punctuation.accessor.ts
-          ^^
-          source.ts meta.block.ts
+          ^
+          source.ts meta.block.ts variable.other.property.ts
+           ^
+           source.ts meta.block.ts
             ^^
             source.ts meta.block.ts keyword.operator.assignment.compound.ts
               ^
@@ -109,12 +123,16 @@ Grammar: TypeScript.tmLanguage
                    ^^
                    source.ts meta.block.ts
 >    node.b += '1'+1+'2';
- ^^^^^^^^
+ ^^^^
  source.ts meta.block.ts
+     ^^^^
+     source.ts meta.block.ts variable.other.object.ts
          ^
          source.ts meta.block.ts punctuation.accessor.ts
-          ^^
-          source.ts meta.block.ts
+          ^
+          source.ts meta.block.ts variable.other.property.ts
+           ^
+           source.ts meta.block.ts
             ^^
             source.ts meta.block.ts keyword.operator.assignment.compound.ts
               ^

tests/baselines/Issue153.baseline.txt

@@ -437,8 +437,10 @@ Grammar: TypeScript.tmLanguage
            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
             ^
             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
-             ^^^^^^
-             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+             ^^^^^
+             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                  ^
+                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                    ^^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
                      ^
@@ -473,7 +475,7 @@ Grammar: TypeScript.tmLanguage
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                      ^^^
-                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                         ^
                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                          ^
@@ -483,7 +485,7 @@ Grammar: TypeScript.tmLanguage
                                               ^
                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                ^^^
-                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                   ^
                                                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                                    ^
@@ -493,7 +495,7 @@ Grammar: TypeScript.tmLanguage
                                                         ^
                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                          ^^^
-                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                             ^
                                                             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                              ^
@@ -517,8 +519,10 @@ Grammar: TypeScript.tmLanguage
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                    ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
-                    ^^^^^^
-                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                    ^^^^^
+                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                         ^
+                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                           ^^
                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
                             ^
@@ -553,7 +557,7 @@ Grammar: TypeScript.tmLanguage
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                      ^^^
-                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                         ^
                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                          ^
@@ -563,7 +567,7 @@ Grammar: TypeScript.tmLanguage
                                               ^
                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                ^^^
-                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                   ^
                                                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                                    ^
@@ -573,7 +577,7 @@ Grammar: TypeScript.tmLanguage
                                                         ^
                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                          ^^^
-                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                             ^
                                                             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                              ^
@@ -597,8 +601,10 @@ Grammar: TypeScript.tmLanguage
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                    ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
-                    ^^^^^^
-                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                    ^^^^^
+                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                         ^
+                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                           ^^
                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
                             ^
@@ -633,7 +639,7 @@ Grammar: TypeScript.tmLanguage
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                      ^^^
-                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                         ^
                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                          ^
@@ -643,7 +649,7 @@ Grammar: TypeScript.tmLanguage
                                               ^
                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                ^^^
-                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                   ^
                                                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                                    ^
@@ -653,7 +659,7 @@ Grammar: TypeScript.tmLanguage
                                                         ^
                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                          ^^^
-                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                             ^
                                                             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                              ^
@@ -700,8 +706,10 @@ Grammar: TypeScript.tmLanguage
                                                                      source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
                                                                       ^
                                                                       source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts
-                                                                       ^^^^^^
+                                                                       ^
                                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                                        ^^^^^
+                                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
                                                                              ^
                                                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                                               ^
@@ -825,8 +833,10 @@ Grammar: TypeScript.tmLanguage
            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
             ^
             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
-             ^^^^^^
-             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+             ^^^^^
+             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                  ^
+                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                    ^^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
                      ^
@@ -861,7 +871,7 @@ Grammar: TypeScript.tmLanguage
                                    ^
                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                     ^^^
-                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                        ^
                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                         ^
@@ -871,7 +881,7 @@ Grammar: TypeScript.tmLanguage
                                              ^
                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                               ^^^
-                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                  ^
                                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                                   ^
@@ -881,7 +891,7 @@ Grammar: TypeScript.tmLanguage
                                                        ^
                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                         ^^^
-                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                            ^
                                                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                             ^
@@ -905,8 +915,10 @@ Grammar: TypeScript.tmLanguage
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                    ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
-                    ^^^^^^
-                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                    ^^^^^
+                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                         ^
+                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                           ^^
                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
                             ^
@@ -941,7 +953,7 @@ Grammar: TypeScript.tmLanguage
                                    ^
                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                     ^^^
-                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                        ^
                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                         ^
@@ -951,7 +963,7 @@ Grammar: TypeScript.tmLanguage
                                              ^
                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                               ^^^
-                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                  ^
                                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                                   ^
@@ -961,7 +973,7 @@ Grammar: TypeScript.tmLanguage
                                                        ^
                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                         ^^^
-                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                            ^
                                                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                             ^
@@ -985,8 +997,10 @@ Grammar: TypeScript.tmLanguage
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                    ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
-                    ^^^^^^
-                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                    ^^^^^
+                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                         ^
+                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                           ^^
                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
                             ^
@@ -1021,7 +1035,7 @@ Grammar: TypeScript.tmLanguage
                                    ^
                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                     ^^^
-                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                        ^
                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                         ^
@@ -1031,7 +1045,7 @@ Grammar: TypeScript.tmLanguage
                                              ^
                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                               ^^^
-                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                  ^
                                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
                                                   ^
@@ -1041,7 +1055,7 @@ Grammar: TypeScript.tmLanguage
                                                        ^
                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                                         ^^^
-                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.other.property.ts
                                                            ^
                                                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                             ^
@@ -1088,8 +1102,10 @@ Grammar: TypeScript.tmLanguage
                                                                      source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
                                                                       ^
                                                                       source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts
-                                                                       ^^^^^^
+                                                                       ^
                                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts
+                                                                        ^^^^^
+                                                                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
                                                                              ^
                                                                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                                               ^

tests/baselines/Issue154.baseline.txt

@@ -59,7 +59,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
               ^^^^^^^^^^^^^^^^^
-              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts
+              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts
                                ^
                                source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
                                 ^
@@ -125,7 +125,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
               ^^^^^^^^^^^^^^^^^
-              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts
+              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts
                                ^
                                source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
                                 ^

tests/baselines/Issue155.baseline.txt

@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
 -----------------------------------
 >matchQuery.find().then(function (results) {
  ^^^^^^^^^^
- source.ts
+ source.ts variable.other.object.ts
            ^
            source.ts punctuation.accessor.ts
             ^^^^
@@ -32,7 +32,7 @@ Grammar: TypeScript.tmLanguage
                   ^
                   source.ts punctuation.accessor.ts
                    ^^^^
-                   source.ts variable.function.ts
+                   source.ts entity.name.function.ts
                        ^
                        source.ts meta.brace.round.ts
                         ^^^^^^^^
@@ -61,7 +61,7 @@ Grammar: TypeScript.tmLanguage
              ^
              source.ts meta.function.ts meta.block.ts meta.brace.round.ts
               ^
-              source.ts meta.function.ts meta.block.ts
+              source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                ^
                source.ts meta.function.ts meta.block.ts keyword.operator.assignment.ts
                 ^
@@ -69,11 +69,11 @@ Grammar: TypeScript.tmLanguage
                  ^
                  source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
                   ^
-                  source.ts meta.function.ts meta.block.ts
+                  source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                    ^
                    source.ts meta.function.ts meta.block.ts keyword.operator.relational.ts
                     ^^^^^^^
-                    source.ts meta.function.ts meta.block.ts
+                    source.ts meta.function.ts meta.block.ts variable.other.object.ts
                            ^
                            source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                             ^^^^^^
@@ -81,7 +81,7 @@ Grammar: TypeScript.tmLanguage
                                   ^
                                   source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
                                    ^
-                                   source.ts meta.function.ts meta.block.ts
+                                   source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                                     ^^
                                     source.ts meta.function.ts meta.block.ts keyword.operator.increment.ts
                                       ^
@@ -91,8 +91,10 @@ Grammar: TypeScript.tmLanguage
                                         ^^
                                         source.ts meta.function.ts meta.block.ts meta.block.ts
 >            notificationQuery.find().then(function (notifications){
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ ^^^^^^^^^^^^
  source.ts meta.function.ts meta.block.ts meta.block.ts
+             ^^^^^^^^^^^^^^^^^
+             source.ts meta.function.ts meta.block.ts meta.block.ts variable.other.object.ts
                               ^
                               source.ts meta.function.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                ^^^^
@@ -104,7 +106,7 @@ Grammar: TypeScript.tmLanguage
                                      ^
                                      source.ts meta.function.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                       ^^^^
-                                      source.ts meta.function.ts meta.block.ts meta.block.ts variable.function.ts
+                                      source.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts
                                           ^
                                           source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                            ^^^^^^^^
@@ -144,7 +146,7 @@ Grammar: TypeScript.tmLanguage
                      ^
                      source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.brace.round.ts
                       ^
-                      source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts
+                      source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                        ^
                        source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts keyword.operator.assignment.ts
                         ^
@@ -152,11 +154,11 @@ Grammar: TypeScript.tmLanguage
                          ^
                          source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
                           ^
-                          source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts
+                          source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                            ^
                            source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts keyword.operator.relational.ts
                             ^^^^^^^^^^^^^
-                            source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts
+                            source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts variable.other.object.ts
                                          ^
                                          source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                           ^^^^^^
@@ -164,7 +166,7 @@ Grammar: TypeScript.tmLanguage
                                                 ^
                                                 source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
                                                  ^
-                                                 source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts
+                                                 source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                                                   ^^
                                                   source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts keyword.operator.increment.ts
                                                     ^
@@ -193,7 +195,7 @@ Grammar: TypeScript.tmLanguage
                                                                       ^
                                                                       source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts
                                                                        ^
-                                                                       source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts
+                                                                       source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
                                                                         ^
                                                                         source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                                                          ^
@@ -201,18 +203,20 @@ Grammar: TypeScript.tmLanguage
                                                                           ^^
                                                                           source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts
 >                    notifications[j].destroy();
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ ^^^^^^^^^^^^^^^^^^^^
  source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts
+                     ^^^^^^^^^^^^^
+                     source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
                                   ^
                                   source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                    ^
-                                   source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.array.literal.ts
+                                   source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.array.literal.ts variable.other.readwrite.ts
                                     ^
                                     source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                      ^
                                      source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                                       ^^^^^^^
-                                      source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts variable.function.ts
+                                      source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts
                                              ^
                                              source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts
                                               ^
@@ -229,12 +233,14 @@ Grammar: TypeScript.tmLanguage
                   ^^
                   source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts
 >                res.destroy();
- ^^^^^^^^^^^^^^^^^^^
+ ^^^^^^^^^^^^^^^^
  source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts
+                 ^^^
+                 source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts variable.other.object.ts
                     ^
                     source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                      ^^^^^^^
-                     source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts variable.function.ts
+                     source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts entity.name.function.ts
                             ^
                             source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.brace.round.ts
                              ^
@@ -284,7 +290,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^^^^
  source.ts meta.function.ts meta.block.ts
          ^^^^^
-         source.ts meta.function.ts meta.block.ts variable.function.ts
+         source.ts meta.function.ts meta.block.ts entity.name.function.ts
               ^
               source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                ^
@@ -296,7 +302,7 @@ Grammar: TypeScript.tmLanguage
                         ^
                         source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts
                          ^^^^^
-                         source.ts meta.function.ts meta.block.ts
+                         source.ts meta.function.ts meta.block.ts variable.other.object.ts
                               ^
                               source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                ^^^^
@@ -317,12 +323,14 @@ Grammar: TypeScript.tmLanguage
                                          source.ts meta.function.ts meta.block.ts
                                           ^
                                           source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts
-                                           ^^^^^^
+                                           ^
                                            source.ts meta.function.ts meta.block.ts
+                                            ^^^^^
+                                            source.ts meta.function.ts meta.block.ts variable.other.object.ts
                                                  ^
                                                  source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                                   ^^^^^^^
-                                                  source.ts meta.function.ts meta.block.ts
+                                                  source.ts meta.function.ts meta.block.ts variable.other.property.ts
                                                          ^
                                                          source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                                                           ^

tests/baselines/Issue157.baseline.txt

@@ -65,7 +65,7 @@ Grammar: TypeScript.tmLanguage
                                                  source.ts
 >items.delete('foo');
  ^^^^^
- source.ts
+ source.ts variable.other.object.ts
       ^
       source.ts punctuation.accessor.ts
        ^^^^^^

tests/baselines/Issue158.baseline.txt

@@ -74,16 +74,20 @@ Grammar: TypeScript.tmLanguage
                      source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
                       ^
                       source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
-                       ^^^
+                       ^
                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                        ^^
+                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
                           ^
                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.relational.ts
                            ^^
                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts
                              ^
                              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
-                              ^^^
+                              ^
                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                               ^^
+                               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
                                  ^^
                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.increment.ts
                                    ^

tests/baselines/Issue161.baseline.txt

@@ -70,7 +70,7 @@ Grammar: TypeScriptReact.tmLanguage
     ^
     source.tsx meta.brace.round.tsx
      ^^^^^^^^^
-     source.tsx
+     source.tsx variable.other.readwrite.tsx
               ^
               source.tsx meta.brace.round.tsx
                ^
@@ -101,8 +101,12 @@ Grammar: TypeScriptReact.tmLanguage
                      ^^
                      source.tsx meta.block.tsx
 >  page = 'via';
- ^^^^^^^
+ ^^
  source.tsx meta.block.tsx
+   ^^^^
+   source.tsx meta.block.tsx variable.other.readwrite.tsx
+       ^
+       source.tsx meta.block.tsx
         ^
         source.tsx meta.block.tsx keyword.operator.assignment.tsx
          ^

tests/baselines/Issue180.baseline.txt

@@ -31,16 +31,20 @@ Grammar: TypeScript.tmLanguage
     source.ts meta.brace.round.ts
      ^^^^^^
      source.ts keyword.operator.typeof.ts
-           ^^^^^^^^^^
+           ^
            source.ts
+            ^^^^^^^^^
+            source.ts variable.other.object.ts
                      ^
                      source.ts punctuation.accessor.ts
                       ^^^^^^^^^^^
-                      source.ts
+                      source.ts variable.other.object.property.ts
                                  ^
                                  source.ts punctuation.accessor.ts
-                                  ^^
-                                  source.ts
+                                  ^
+                                  source.ts variable.other.property.ts
+                                   ^
+                                   source.ts
                                     ^^
                                     source.ts keyword.operator.comparison.ts
                                       ^
@@ -73,16 +77,18 @@ Grammar: TypeScript.tmLanguage
           source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
            ^
            source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-            ^^^^^^^^^^
+            ^
             source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+             ^^^^^^^^^
+             source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.ts
                       ^
                       source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                        ^^^^^^^^^^^
-                       source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                       source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.property.ts
                                   ^
                                   source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                    ^
-                                   source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                   source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.property.ts
                                     ^
                                     source.ts meta.block.ts punctuation.terminator.statement.ts
                                      ^^
@@ -96,20 +102,24 @@ Grammar: TypeScript.tmLanguage
         source.ts meta.block.ts
          ^
          source.ts meta.block.ts meta.brace.round.ts
-          ^^
+          ^
           source.ts meta.block.ts
+           ^
+           source.ts meta.block.ts variable.other.readwrite.ts
             ^
             source.ts meta.block.ts keyword.operator.assignment.ts
              ^
              source.ts meta.block.ts constant.numeric.decimal.ts
               ^
               source.ts meta.block.ts punctuation.separator.comma.ts
-               ^^^^^
+               ^
                source.ts meta.block.ts
+                ^^^^
+                source.ts meta.block.ts variable.other.readwrite.ts
                     ^
                     source.ts meta.block.ts keyword.operator.assignment.ts
                      ^
-                     source.ts meta.block.ts
+                     source.ts meta.block.ts variable.other.object.ts
                       ^
                       source.ts meta.block.ts punctuation.accessor.ts
                        ^^^^^^
@@ -118,16 +128,22 @@ Grammar: TypeScript.tmLanguage
                              source.ts meta.block.ts
                               ^
                               source.ts meta.block.ts punctuation.terminator.statement.ts
-                               ^^
+                               ^
                                source.ts meta.block.ts
+                                ^
+                                source.ts meta.block.ts variable.other.readwrite.ts
                                  ^
                                  source.ts meta.block.ts keyword.operator.relational.ts
-                                  ^^^^^
-                                  source.ts meta.block.ts
+                                  ^^^^
+                                  source.ts meta.block.ts variable.other.readwrite.ts
+                                      ^
+                                      source.ts meta.block.ts
                                        ^
                                        source.ts meta.block.ts punctuation.terminator.statement.ts
-                                        ^^
+                                        ^
                                         source.ts meta.block.ts
+                                         ^
+                                         source.ts meta.block.ts variable.other.readwrite.ts
                                           ^^
                                           source.ts meta.block.ts keyword.operator.increment.ts
                                             ^
@@ -147,7 +163,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^^^^
  source.ts meta.block.ts meta.block.ts
          ^
-         source.ts meta.block.ts meta.block.ts variable.function.ts
+         source.ts meta.block.ts meta.block.ts entity.name.function.ts
           ^
           source.ts meta.block.ts meta.block.ts meta.brace.round.ts
            ^
@@ -158,12 +174,14 @@ Grammar: TypeScript.tmLanguage
                  source.ts meta.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts
                   ^
                   source.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts
-                   ^^
+                   ^
                    source.ts meta.block.ts meta.block.ts
+                    ^
+                    source.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
                      ^
                      source.ts meta.block.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                       ^
-                      source.ts meta.block.ts meta.block.ts meta.array.literal.ts
+                      source.ts meta.block.ts meta.block.ts meta.array.literal.ts variable.other.readwrite.ts
                        ^
                        source.ts meta.block.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                         ^
@@ -171,7 +189,7 @@ Grammar: TypeScript.tmLanguage
                          ^
                          source.ts meta.block.ts meta.block.ts punctuation.accessor.ts
                           ^^^
-                          source.ts meta.block.ts meta.block.ts variable.function.ts
+                          source.ts meta.block.ts meta.block.ts entity.name.function.ts
                              ^
                              source.ts meta.block.ts meta.block.ts meta.brace.round.ts
                               ^
@@ -225,24 +243,28 @@ Grammar: TypeScript.tmLanguage
     source.ts
      ^
      source.ts meta.brace.round.ts
-      ^^
+      ^
       source.ts
+       ^
+       source.ts variable.other.readwrite.ts
         ^
         source.ts keyword.operator.assignment.ts
          ^
          source.ts constant.numeric.decimal.ts
           ^
           source.ts punctuation.separator.comma.ts
-           ^^^^^
+           ^
            source.ts
+            ^^^^
+            source.ts variable.other.readwrite.ts
                 ^
                 source.ts keyword.operator.assignment.ts
                  ^^^^^^^^^
-                 source.ts
+                 source.ts variable.other.object.ts
                           ^
                           source.ts punctuation.accessor.ts
                            ^^^^^^^^^^^^^^^
-                           source.ts
+                           source.ts variable.other.object.property.ts
                                           ^
                                           source.ts punctuation.accessor.ts
                                            ^^^^^^
@@ -251,16 +273,22 @@ Grammar: TypeScript.tmLanguage
                                                  source.ts
                                                   ^
                                                   source.ts punctuation.terminator.statement.ts
-                                                   ^^
+                                                   ^
                                                    source.ts
+                                                    ^
+                                                    source.ts variable.other.readwrite.ts
                                                      ^
                                                      source.ts keyword.operator.relational.ts
-                                                      ^^^^^
-                                                      source.ts
+                                                      ^^^^
+                                                      source.ts variable.other.readwrite.ts
+                                                          ^
+                                                          source.ts
                                                            ^
                                                            source.ts punctuation.terminator.statement.ts
-                                                            ^^
+                                                            ^
                                                             source.ts
+                                                             ^
+                                                             source.ts variable.other.readwrite.ts
                                                               ^^
                                                               source.ts keyword.operator.increment.ts
                                                                 ^
@@ -273,12 +301,16 @@ Grammar: TypeScript.tmLanguage
   ^^
   source.ts meta.block.ts
 >    oSetttings.something = "";
- ^^^^^^^^^^^^^^
+ ^^^^
  source.ts meta.block.ts
+     ^^^^^^^^^^
+     source.ts meta.block.ts variable.other.object.ts
                ^
                source.ts meta.block.ts punctuation.accessor.ts
-                ^^^^^^^^^^
-                source.ts meta.block.ts
+                ^^^^^^^^^
+                source.ts meta.block.ts variable.other.property.ts
+                         ^
+                         source.ts meta.block.ts
                           ^
                           source.ts meta.block.ts keyword.operator.assignment.ts
                            ^

tests/baselines/Issue182.baseline.txt

@@ -19,15 +19,17 @@ Grammar: TypeScript.tmLanguage
          ^
          source.ts punctuation.accessor.ts
           ^^^^^^^^^^
-          source.ts
+          source.ts variable.other.object.property.ts
                     ^
                     source.ts punctuation.accessor.ts
                      ^^^^^^
                      source.ts support.variable.property.ts
                            ^
                            source.ts keyword.operator.relational.ts
-                            ^^^^^^
-                            source.ts
+                            ^^^^^
+                            source.ts variable.other.readwrite.ts
+                                 ^
+                                 source.ts
                                   ^^
                                   source.ts keyword.operator.logical.ts
                                     ^
@@ -40,8 +42,10 @@ Grammar: TypeScript.tmLanguage
                                        source.ts variable.language.this.ts
                                            ^
                                            source.ts punctuation.accessor.ts
-                                            ^^^^^^^^^
-                                            source.ts
+                                            ^^^^^^^^
+                                            source.ts variable.other.property.ts
+                                                    ^
+                                                    source.ts
                                                      ^^
                                                      source.ts keyword.operator.logical.ts
                                                        ^
@@ -53,7 +57,7 @@ Grammar: TypeScript.tmLanguage
                                                              ^
                                                              source.ts punctuation.accessor.ts
                                                               ^^^^^^^^^^^^^
-                                                              source.ts
+                                                              source.ts variable.other.property.ts
                                                                            ^
                                                                            source.ts meta.brace.round.ts
                                                                             ^

tests/baselines/Issue186.baseline.txt

@@ -96,7 +96,7 @@ Grammar: TypeScript.tmLanguage
                 ^
                 source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                  ^^^^^^
-                 source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts
+                 source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts variable.other.readwrite.ts
                        ^
                        source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                         ^
@@ -118,7 +118,7 @@ Grammar: TypeScript.tmLanguage
               ^
               source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                ^^^^^^
-               source.ts meta.function.ts meta.block.ts
+               source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                      ^
                      source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                       ^
@@ -134,12 +134,16 @@ Grammar: TypeScript.tmLanguage
            source.ts meta.function.ts meta.block.ts support.function.console.ts
               ^
               source.ts meta.function.ts meta.block.ts meta.brace.round.ts
-               ^^^^^^^
-               source.ts meta.function.ts meta.block.ts
+               ^^^^^^
+               source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
+                     ^
+                     source.ts meta.function.ts meta.block.ts
                       ^
                       source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts
-                       ^^^^^^^
+                       ^
                        source.ts meta.function.ts meta.block.ts
+                        ^^^^^^
+                        source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                               ^
                               source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                                ^
@@ -156,7 +160,7 @@ Grammar: TypeScript.tmLanguage
               ^
               source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                ^^^^^^
-               source.ts meta.function.ts meta.block.ts
+               source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                      ^
                      source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                       ^
@@ -173,7 +177,7 @@ Grammar: TypeScript.tmLanguage
               ^
               source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                ^^^^^^^
-               source.ts meta.function.ts meta.block.ts
+               source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                       ^
                       source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                        ^
@@ -191,8 +195,12 @@ Grammar: TypeScript.tmLanguage
         source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
          ^
          source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-          ^^^^^^^^
+          ^
           source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+           ^^^^^^
+           source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                 ^
+                 source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                   ^
                   source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts
                    ^
@@ -203,8 +211,10 @@ Grammar: TypeScript.tmLanguage
                      source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                       ^
                       source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts
-                       ^^^^^^^
+                       ^
                        source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                        ^^^^^^
+                        source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                               ^
                               source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
 >}

tests/baselines/Issue187.baseline.txt

@@ -43,23 +43,23 @@ Grammar: TypeScript.tmLanguage
                                      ^
                                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts
                                       ^^^^
-                                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.ts
                                           ^
                                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                            ^^^^^^^^
-                                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                                    ^
                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                                     ^^^^
-                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.ts
                                                         ^
                                                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                                          ^^^^^^^
-                                                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                                                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                                                 ^
                                                                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                                                  ^^^
-                                                                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                                                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                                                                     ^
                                                                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                                                      ^
@@ -115,24 +115,26 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts
      ^^^^^^
      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts keyword.control.flow.ts
-           ^^^^^^
+           ^^
            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts
+             ^^^^
+             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts variable.other.object.ts
                  ^
                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                   ^^^^^^^^
-                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts variable.function.ts
+                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts entity.name.function.ts
                           ^
                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts
                            ^^^^
-                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts
+                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts variable.other.object.ts
                                ^
                                source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                 ^^^^^^^
-                                source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts variable.function.ts
+                                source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts entity.name.function.ts
                                        ^
                                        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts
                                         ^^^
-                                        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts
+                                        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                                            ^
                                            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts
                                             ^

tests/baselines/Issue191.baseline.txt

@@ -71,8 +71,10 @@ Grammar: TypeScript.tmLanguage
                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                   ^
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-                   ^^
+                   ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                    ^
+                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.other.object.ts
                      ^
                      source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                       ^^^^^
@@ -80,7 +82,7 @@ Grammar: TypeScript.tmLanguage
                            ^
                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts
                             ^^^^^^^
-                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                                    ^
                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts
                                     ^
@@ -96,8 +98,10 @@ Grammar: TypeScript.tmLanguage
          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-              ^^^^^^
-              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+              ^^^^^
+              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+                   ^
+                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
                      ^
@@ -118,7 +122,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^^^^
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
          ^^^^
-         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts
+         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
               ^^^^
@@ -179,7 +183,7 @@ Grammar: TypeScript.tmLanguage
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                      ^^^^^^
-                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts
+                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts variable.other.object.property.ts
                            ^
                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                             ^^^^^
@@ -275,8 +279,10 @@ Grammar: TypeScript.tmLanguage
                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                   ^
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-                   ^^
+                   ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                    ^
+                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.other.object.ts
                      ^
                      source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                       ^^^^^
@@ -284,7 +290,7 @@ Grammar: TypeScript.tmLanguage
                            ^
                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts
                             ^^^^^^^
-                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                                    ^
                                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts
                                     ^
@@ -300,8 +306,10 @@ Grammar: TypeScript.tmLanguage
          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-              ^^^^^^
-              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+              ^^^^^
+              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+                   ^
+                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
                      ^
@@ -322,7 +330,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^^^^^
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
          ^^^^
-         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts
+         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
               ^^^^
@@ -383,7 +391,7 @@ Grammar: TypeScript.tmLanguage
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                      ^^^^^^
-                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts
+                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts variable.other.object.property.ts
                            ^
                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                             ^^^^^
@@ -439,8 +447,10 @@ Grammar: TypeScriptReact.tmLanguage
                  source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
                   ^
                   source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx
-                   ^^
+                   ^
                    source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
+                    ^
+                    source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx constant.other.object.tsx
                      ^
                      source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx punctuation.accessor.tsx
                       ^^^^^
@@ -469,7 +479,7 @@ Grammar: TypeScriptReact.tmLanguage
                     ^
                     source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.accessor.tsx
                      ^^^^^^
-                     source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx
+                     source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.other.object.property.tsx
                            ^
                            source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.accessor.tsx
                             ^^^^^
@@ -511,11 +521,19 @@ Grammar: TypeScriptReact.tmLanguage
  ^^^^
  source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx
      ^^^^^^^^^^^
-     source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.function.tsx
+     source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx entity.name.function.tsx
                 ^
                 source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx meta.brace.round.tsx
-                 ^^^^^^^^^^^^^^^^^^^^^^
-                 source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx
+                 ^^^^^^
+                 source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.other.readwrite.tsx
+                       ^
+                       source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx
+                        ^^^^^^^
+                        source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.other.readwrite.tsx
+                               ^^
+                               source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx
+                                 ^^^^^^
+                                 source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.other.readwrite.tsx
                                        ^
                                        source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx meta.brace.round.tsx
                                         ^

tests/baselines/Issue191.txt

@@ -38,7 +38,7 @@ Grammar: TypeScript.tmLanguage
              ^^^^
              [3, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
                             ^^^^^^^
-                            [3, 28]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+                            [3, 28]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
                                      ^
                                      [3, 37]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts 
 >        this.store = new Data();
@@ -48,7 +48,7 @@ Grammar: TypeScript.tmLanguage
                           [4, 26]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts 
 >        gaze(path.join(this.content, "**/*.json"), (err, watch) => {
          ^^^^
-         [5, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts 
+         [5, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts 
                                        ^^^^^^^^^
                                        [5, 39]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts 
                                                  ^
@@ -82,7 +82,7 @@ Grammar: TypeScript.tmLanguage
              ^^^^
              [13, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
                             ^^^^^^^
-                            [13, 28]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+                            [13, 28]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
                                      ^
                                      [13, 37]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts 
 >        this.store = new Data();
@@ -92,7 +92,7 @@ Grammar: TypeScript.tmLanguage
                           [14, 26]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts 
 >        gaze(path.join(this.content, "**/*.json"), (err, watch) => {
          ^^^^
-         [15, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts 
+         [15, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts 
                                        ^^^^^^^^^
                                        [15, 39]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts 
                                                  ^

tests/baselines/Issue198.baseline.txt

@@ -68,19 +68,29 @@ Grammar: TypeScript.tmLanguage
           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
            ^
            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-            ^^^
+            ^
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+             ^
+             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+              ^
+              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                ^
                source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                ^^^
+                ^
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                 ^
+                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                  ^
+                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
 >    / c;
  ^^^^
  source.ts
      ^
      source.ts keyword.operator.arithmetic.ts
-      ^^
+      ^
       source.ts
+       ^
+       source.ts variable.other.readwrite.ts
         ^
         source.ts punctuation.terminator.statement.ts
          ^^
@@ -96,39 +106,69 @@ Grammar: TypeScript.tmLanguage
            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
             ^
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-             ^^^
+             ^
              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+              ^
+              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+               ^
+               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                 ^
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                 ^^^
+                 ^
                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                  ^
+                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                   ^
+                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
 >    / c * a + b / a / b / c;
  ^^^^
  source.ts
      ^
      source.ts keyword.operator.arithmetic.ts
-      ^^^
+      ^
       source.ts
+       ^
+       source.ts variable.other.readwrite.ts
+        ^
+        source.ts
          ^
          source.ts keyword.operator.arithmetic.ts
-          ^^^
+          ^
           source.ts
+           ^
+           source.ts variable.other.readwrite.ts
+            ^
+            source.ts
              ^
              source.ts keyword.operator.arithmetic.ts
-              ^^^
+              ^
               source.ts
+               ^
+               source.ts variable.other.readwrite.ts
+                ^
+                source.ts
                  ^
                  source.ts keyword.operator.arithmetic.ts
-                  ^^^
+                  ^
                   source.ts
+                   ^
+                   source.ts variable.other.readwrite.ts
+                    ^
+                    source.ts
                      ^
                      source.ts keyword.operator.arithmetic.ts
-                      ^^^
+                      ^
                       source.ts
+                       ^
+                       source.ts variable.other.readwrite.ts
+                        ^
+                        source.ts
                          ^
                          source.ts keyword.operator.arithmetic.ts
-                          ^^
+                          ^
                           source.ts
+                           ^
+                           source.ts variable.other.readwrite.ts
                             ^
                             source.ts punctuation.terminator.statement.ts
                              ^^
@@ -144,35 +184,65 @@ Grammar: TypeScript.tmLanguage
            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
             ^
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-             ^^^
+             ^
              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+              ^
+              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+               ^
+               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                 ^
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                 ^^^
+                 ^
                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                  ^
+                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                   ^
+                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                     ^
                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                     ^^^
+                     ^
                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                      ^
+                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                       ^
+                       source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                         ^
                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                         ^^^
+                         ^
                          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                          ^
+                          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                           ^
+                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                             ^
                             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                             ^^^
+                             ^
                              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                              ^
+                              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                               ^
+                               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                                 ^
                                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                                 ^^^
+                                 ^
                                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                  ^
+                                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                                   ^
+                                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                                     ^
                                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                                     ^^^
+                                     ^
                                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                      ^
+                                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                                       ^
+                                       source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                                         ^
                                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                                         ^^
+                                         ^
                                          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                          ^
+                                          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                                            ^
                                            source.ts punctuation.terminator.statement.ts

tests/baselines/Issue200.baseline.txt

@@ -83,8 +83,10 @@ 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 variable.other.readwrite.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 variable.other.readwrite.ts 
 >}
  ^
  [6, 1]: source.ts meta.block.ts punctuation.definition.block.ts 

tests/baselines/Issue208.baseline.txt

@@ -71,7 +71,7 @@ Grammar: TypeScript.tmLanguage
               ^
               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                ^^^^^^^^^
-               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                         ^
                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
                          ^^^^^^
@@ -171,7 +171,7 @@ Grammar: TypeScript.tmLanguage
                       ^
                       source.ts meta.class.ts meta.field.declaration.ts
                        ^^^^^^^^^
-                       source.ts meta.class.ts meta.field.declaration.ts variable.function.ts
+                       source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts
                                 ^
                                 source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
                                  ^^^^^^
@@ -252,7 +252,7 @@ Grammar: TypeScript.tmLanguage
                ^
                source.ts meta.class.ts meta.field.declaration.ts
                 ^^^^^^^^^
-                source.ts meta.class.ts meta.field.declaration.ts variable.function.ts
+                source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts
                          ^
                          source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
                           ^^^^^^

tests/baselines/Issue208.txt

@@ -29,7 +29,7 @@ Grammar: TypeScript.tmLanguage
                                                [1, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts 
 >var someVar = makeThing<number, string>('data');
                ^^^^^^^^^
-               [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts 
+               [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts 
                          ^^^^^^
                          [2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts 
                                  ^^^^^^
@@ -53,7 +53,7 @@ Grammar: TypeScript.tmLanguage
             ^^^^^^^^
             [6, 12]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts 
                        ^^^^^^^^^
-                       [6, 23]: source.ts meta.class.ts meta.field.declaration.ts variable.function.ts 
+                       [6, 23]: source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts 
                                  ^^^^^^
                                  [6, 33]: source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts 
                                          ^^^^^^
@@ -68,7 +68,7 @@ Grammar: TypeScript.tmLanguage
                                   [8, 34]: source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts 
 >    someProp = makeThing<number, string>('data');
                 ^^^^^^^^^
-                [9, 16]: source.ts meta.class.ts meta.field.declaration.ts variable.function.ts 
+                [9, 16]: source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts 
                           ^^^^^^
                           [9, 26]: source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts 
                                   ^^^^^^

tests/baselines/Issue212.baseline.txt

@@ -24,19 +24,25 @@ Grammar: TypeScript.tmLanguage
          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
           ^
           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-           ^^^^^
+           ^
            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+            ^^^^
+            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                 ^
                 source.ts punctuation.terminator.statement.ts
                  ^^
                  source.ts
 >from = a; // is a variable and should be in white color like other variables
- ^^^^^
- source.ts
+ ^^^^
+ source.ts variable.other.readwrite.ts
+     ^
+     source.ts
       ^
       source.ts keyword.operator.assignment.ts
-       ^^
+       ^
        source.ts
+        ^
+        source.ts variable.other.readwrite.ts
          ^
          source.ts punctuation.terminator.statement.ts
           ^
@@ -53,8 +59,10 @@ Grammar: TypeScript.tmLanguage
  source.ts support.type.object.module.ts
         ^
         source.ts punctuation.accessor.ts
-         ^^^^^^
-         source.ts
+         ^^^^^
+         source.ts entity.name.function.ts
+              ^
+              source.ts
                ^
                source.ts keyword.operator.assignment.ts
                 ^
@@ -96,11 +104,13 @@ Grammar: TypeScript.tmLanguage
  source.ts
 >t.me = 1;
  ^
- source.ts
+ source.ts variable.other.object.ts
   ^
   source.ts punctuation.accessor.ts
-   ^^^
-   source.ts
+   ^^
+   source.ts variable.other.property.ts
+     ^
+     source.ts
       ^
       source.ts keyword.operator.assignment.ts
        ^
@@ -113,11 +123,13 @@ Grammar: TypeScript.tmLanguage
           source.ts
 >t.is = 2; // `is` is in blue but should be the same color as the above (1)
  ^
- source.ts
+ source.ts variable.other.object.ts
   ^
   source.ts punctuation.accessor.ts
-   ^^^
-   source.ts
+   ^^
+   source.ts variable.other.property.ts
+     ^
+     source.ts
       ^
       source.ts keyword.operator.assignment.ts
        ^
@@ -134,11 +146,13 @@ Grammar: TypeScript.tmLanguage
              source.ts comment.line.double-slash.ts
 >t.in = 3; // `in` is in blue but should be the same color as the above (1)
  ^
- source.ts
+ source.ts variable.other.object.ts
   ^
   source.ts punctuation.accessor.ts
-   ^^^
-   source.ts
+   ^^
+   source.ts variable.other.property.ts
+     ^
+     source.ts
       ^
       source.ts keyword.operator.assignment.ts
        ^
@@ -155,11 +169,13 @@ Grammar: TypeScript.tmLanguage
              source.ts comment.line.double-slash.ts
 >t.of = 4; // `of` is in blue but should be the same color as the above (1)
  ^
- source.ts
+ source.ts variable.other.object.ts
   ^
   source.ts punctuation.accessor.ts
-   ^^^
-   source.ts
+   ^^
+   source.ts variable.other.property.ts
+     ^
+     source.ts
       ^
       source.ts keyword.operator.assignment.ts
        ^

tests/baselines/Issue215.baseline.txt

@@ -53,12 +53,16 @@ Grammar: TypeScript.tmLanguage
                  source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                   ^
                   source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
-                   ^^
+                   ^
                    source.ts meta.function.ts meta.block.ts
+                    ^
+                    source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                      ^
                      source.ts meta.function.ts meta.block.ts keyword.operator.relational.ts
-                      ^^
-                      source.ts meta.function.ts meta.block.ts
+                      ^
+                      source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
+                       ^
+                       source.ts meta.function.ts meta.block.ts
                         ^
                         source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
                          ^
@@ -66,7 +70,7 @@ Grammar: TypeScript.tmLanguage
                           ^^
                           source.ts meta.function.ts meta.block.ts keyword.operator.increment.ts
                             ^
-                            source.ts meta.function.ts meta.block.ts
+                            source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                              ^
                              source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                               ^
@@ -114,12 +118,16 @@ Grammar: TypeScript.tmLanguage
              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
               ^
               source.ts punctuation.terminator.statement.ts
-               ^^
+               ^
                source.ts
+                ^
+                source.ts variable.other.readwrite.ts
                  ^
                  source.ts keyword.operator.relational.ts
-                  ^^
-                  source.ts
+                  ^
+                  source.ts variable.other.readwrite.ts
+                   ^
+                   source.ts
                     ^
                     source.ts punctuation.terminator.statement.ts
                      ^
@@ -127,7 +135,7 @@ Grammar: TypeScript.tmLanguage
                       ^^
                       source.ts keyword.operator.increment.ts
                         ^
-                        source.ts
+                        source.ts variable.other.readwrite.ts
                          ^
                          source.ts meta.brace.round.ts
                           ^

tests/baselines/Issue217.baseline.txt

@@ -36,7 +36,7 @@ Grammar: TypeScript.tmLanguage
    ^
    source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts
     ^^^^^^
-    source.ts meta.class.ts meta.decorator.ts variable.function.ts
+    source.ts meta.class.ts meta.decorator.ts entity.name.function.ts
           ^
           source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts
            ^
@@ -127,7 +127,7 @@ Grammar: TypeScript.tmLanguage
    ^
    source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts
     ^^^^^^
-    source.ts meta.class.ts meta.decorator.ts variable.function.ts
+    source.ts meta.class.ts meta.decorator.ts entity.name.function.ts
           ^
           source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts
            ^

tests/baselines/Issue218.baseline.txt

@@ -59,7 +59,7 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
       ^^^
-      source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
+      source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts variable.other.readwrite.ts
          ^
          source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
           ^

tests/baselines/Issue219.baseline.txt

@@ -48,8 +48,10 @@ Grammar: TypeScript.tmLanguage
      source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.language.this.ts
          ^
          source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.accessor.ts
-          ^^^^^^
-          source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
+          ^^^^^
+          source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.property.ts
+               ^
+               source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
 >if (!map) return;
  ^^
  source.ts keyword.control.conditional.ts
@@ -60,7 +62,7 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts keyword.operator.logical.ts
       ^^^
-      source.ts
+      source.ts variable.other.readwrite.ts
          ^
          source.ts meta.brace.round.ts
           ^

tests/baselines/Issue22.baseline.txt

@@ -8,7 +8,7 @@ Grammar: TypeScript.tmLanguage
 -----------------------------------
 >app.get('/test/', (req, res) => {
  ^^^
- source.ts
+ source.ts variable.other.object.ts
     ^
     source.ts punctuation.accessor.ts
      ^^^

tests/baselines/Issue223.baseline.txt

@@ -17,8 +17,10 @@ Grammar: TypeScript.tmLanguage
     source.ts
      ^
      source.ts meta.brace.round.ts
-      ^^
-      source.ts
+      ^
+      source.ts variable.other.readwrite.ts
+       ^
+       source.ts
         ^
         source.ts keyword.operator.assignment.ts
          ^
@@ -27,16 +29,22 @@ Grammar: TypeScript.tmLanguage
           source.ts constant.numeric.decimal.ts
            ^
            source.ts punctuation.terminator.statement.ts
-            ^^
+            ^
             source.ts
+             ^
+             source.ts variable.other.readwrite.ts
               ^
               source.ts keyword.operator.relational.ts
-               ^^^^
-               source.ts
+               ^^^
+               source.ts variable.other.readwrite.ts
+                  ^
+                  source.ts
                    ^
                    source.ts punctuation.terminator.statement.ts
-                    ^^
+                    ^
                     source.ts
+                     ^
+                     source.ts variable.other.readwrite.ts
                       ^^
                       source.ts keyword.operator.increment.ts
                         ^
@@ -57,7 +65,7 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.block.ts meta.brace.round.ts
        ^^^
-       source.ts meta.block.ts
+       source.ts meta.block.ts variable.other.readwrite.ts
           ^
           source.ts meta.block.ts meta.brace.round.ts
            ^
@@ -67,8 +75,12 @@ Grammar: TypeScript.tmLanguage
              ^^
              source.ts meta.block.ts meta.block.ts
 >    bar = true 
- ^^^^^^^^
+ ^^^^
  source.ts meta.block.ts meta.block.ts
+     ^^^
+     source.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
+        ^
+        source.ts meta.block.ts meta.block.ts
          ^
          source.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts
           ^

tests/baselines/Issue230.baseline.txt

@@ -17,11 +17,11 @@ Grammar: TypeScript.tmLanguage
    source.ts comment.line.double-slash.ts
 >ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) => input.filter((value, index, array) => {
  ^^^^
- source.ts
+ source.ts variable.other.object.ts
      ^
      source.ts punctuation.accessor.ts
       ^^^^^^
-      source.ts variable.function.ts
+      source.ts entity.name.function.ts
             ^
             source.ts meta.brace.round.ts
              ^
@@ -95,11 +95,11 @@ Grammar: TypeScript.tmLanguage
                                                                                   ^
                                                                                   source.ts meta.arrow.ts
                                                                                    ^^^^^
-                                                                                   source.ts
+                                                                                   source.ts variable.other.object.ts
                                                                                         ^
                                                                                         source.ts punctuation.accessor.ts
                                                                                          ^^^^^^
-                                                                                         source.ts variable.function.ts
+                                                                                         source.ts entity.name.function.ts
                                                                                                ^
                                                                                                source.ts meta.brace.round.ts
                                                                                                 ^
@@ -143,12 +143,16 @@ Grammar: TypeScript.tmLanguage
               source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                ^
                source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-                ^^^^^^
+                ^
                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                 ^^^^^
+                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.ts
                       ^
                       source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
-                       ^^^^^
-                       source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                       ^^^^
+                       source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.property.ts
+                           ^
+                           source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                             ^^
                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.logical.ts
                               ^
@@ -156,11 +160,11 @@ Grammar: TypeScript.tmLanguage
                                ^
                                source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                 ^^^^^
-                                source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.ts
                                      ^
                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                       ^^^
-                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.property.ts
                                          ^
                                          source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                           ^
@@ -170,7 +174,7 @@ Grammar: TypeScript.tmLanguage
                                             ^
                                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                                              ^^^^^^
-                                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                                    ^
                                                    source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                                     ^
@@ -178,11 +182,11 @@ Grammar: TypeScript.tmLanguage
                                                      ^^
                                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
                                                        ^^^^^
-                                                       source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts
+                                                       source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts variable.other.object.ts
                                                             ^
                                                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.accessor.ts
                                                              ^^^
-                                                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts
+                                                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts variable.other.property.ts
                                                                 ^
                                                                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
                                                                  ^
@@ -190,11 +194,11 @@ Grammar: TypeScript.tmLanguage
                                                                   ^^
                                                                   source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
                                                                     ^^^^^
-                                                                    source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts
+                                                                    source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts variable.other.object.ts
                                                                          ^
                                                                          source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.accessor.ts
                                                                           ^^^^
-                                                                          source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts
+                                                                          source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts variable.other.property.ts
                                                                               ^
                                                                               source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
                                                                                ^
@@ -214,7 +218,7 @@ Grammar: TypeScript.tmLanguage
                                                                                                      ^
                                                                                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                                                                                       ^^^^^^
-                                                                                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                                                                                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                                                                                             ^
                                                                                                             source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                                                                                              ^
@@ -226,15 +230,15 @@ Grammar: TypeScript.tmLanguage
                                                                                                                 ^
                                                                                                                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                                                                                                                  ^^^^^^^^^
-                                                                                                                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                                                                                                                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                                                                                                           ^
                                                                                                                           source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                                                                                                            ^^^^^
-                                                                                                                           source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                                                                                                           source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.ts
                                                                                                                                 ^
                                                                                                                                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                                                                                                                  ^^^^
-                                                                                                                                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                                                                                                                 source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.property.ts
                                                                                                                                      ^
                                                                                                                                      source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                                                                                                                       ^
@@ -252,17 +256,17 @@ Grammar: TypeScript.tmLanguage
            ^
            source.ts meta.arrow.ts meta.block.ts
             ^^^^^^
-            source.ts meta.arrow.ts meta.block.ts variable.function.ts
+            source.ts meta.arrow.ts meta.block.ts entity.name.function.ts
                   ^
                   source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                    ^^^^
-                   source.ts meta.arrow.ts meta.block.ts
+                   source.ts meta.arrow.ts meta.block.ts variable.other.readwrite.ts
                        ^
                        source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                         ^
                         source.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                          ^^^^^^
-                         source.ts meta.arrow.ts meta.block.ts variable.function.ts
+                         source.ts meta.arrow.ts meta.block.ts entity.name.function.ts
                                ^
                                source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                                 ^
@@ -280,17 +284,17 @@ Grammar: TypeScript.tmLanguage
                                                   ^
                                                   source.ts meta.arrow.ts meta.block.ts
                                                    ^^^^^^
-                                                   source.ts meta.arrow.ts meta.block.ts variable.function.ts
+                                                   source.ts meta.arrow.ts meta.block.ts entity.name.function.ts
                                                          ^
                                                          source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                                                           ^^^^^
-                                                          source.ts meta.arrow.ts meta.block.ts
+                                                          source.ts meta.arrow.ts meta.block.ts variable.other.readwrite.ts
                                                                ^
                                                                source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                                                                 ^
                                                                 source.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                                                                  ^^^^^^
-                                                                 source.ts meta.arrow.ts meta.block.ts variable.function.ts
+                                                                 source.ts meta.arrow.ts meta.block.ts entity.name.function.ts
                                                                        ^
                                                                        source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
                                                                         ^

tests/baselines/Issue232.baseline.txt

@@ -61,16 +61,18 @@ Grammar: TypeScript.tmLanguage
                source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                 ^
                 source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-                 ^^^^^^^^^^
+                 ^
                  source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                  ^^^^^^^^^
+                  source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.ts
                            ^
                            source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                             ^^^^
-                            source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                            source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.object.property.ts
                                 ^
                                 source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                  ^^^^^^^^^
-                                 source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                                 source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                           ^
                                           source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                            ^

tests/baselines/Issue235.baseline.txt

@@ -29,11 +29,11 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts
       ^^^^^
-      source.ts meta.class.ts meta.decorator.ts
+      source.ts meta.class.ts meta.decorator.ts variable.other.object.ts
            ^
            source.ts meta.class.ts meta.decorator.ts punctuation.accessor.ts
             ^^^
-            source.ts meta.class.ts meta.decorator.ts variable.function.ts
+            source.ts meta.class.ts meta.decorator.ts entity.name.function.ts
                ^
                source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts
                 ^
@@ -88,12 +88,14 @@ Grammar: TypeScript.tmLanguage
                                          ^^
                                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
 >        s.sendFile();
- ^^^^^^^^^
+ ^^^^^^^^
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+         ^
+         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
           ^
           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
            ^^^^^^^^
-           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts
+           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts
                    ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
                     ^

tests/baselines/Issue236.baseline.txt

@@ -80,7 +80,7 @@ Grammar: TypeScript.tmLanguage
                    ^
                    source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts punctuation.accessor.ts
                     ^^^^^^^^
-                    source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
+                    source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts variable.other.property.ts
                             ^
                             source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
                              ^

tests/baselines/Issue244.baseline.txt

@@ -13,15 +13,17 @@ Grammar: TypeScript.tmLanguage
 -----------------------------------
 >a.withLatestFrom(axis === 'x' ? initialX : initialY)
  ^
- source.ts
+ source.ts variable.other.object.ts
   ^
   source.ts punctuation.accessor.ts
    ^^^^^^^^^^^^^^
-   source.ts variable.function.ts
+   source.ts entity.name.function.ts
                  ^
                  source.ts meta.brace.round.ts
-                  ^^^^^
-                  source.ts
+                  ^^^^
+                  source.ts variable.other.readwrite.ts
+                      ^
+                      source.ts
                        ^^^
                        source.ts keyword.operator.comparison.ts
                           ^
@@ -36,12 +38,18 @@ Grammar: TypeScript.tmLanguage
                               source.ts
                                ^
                                source.ts keyword.operator.ternary.ts
-                                ^^^^^^^^^^
+                                ^
                                 source.ts
+                                 ^^^^^^^^
+                                 source.ts variable.other.readwrite.ts
+                                         ^
+                                         source.ts
                                           ^
                                           source.ts keyword.operator.ternary.ts
-                                           ^^^^^^^^^
+                                           ^
                                            source.ts
+                                            ^^^^^^^^
+                                            source.ts variable.other.readwrite.ts
                                                     ^
                                                     source.ts meta.brace.round.ts
                                                      ^^
@@ -52,7 +60,7 @@ Grammar: TypeScript.tmLanguage
   ^
   source.ts punctuation.accessor.ts
    ^^^
-   source.ts variable.function.ts
+   source.ts entity.name.function.ts
       ^
       source.ts meta.brace.round.ts
        ^
@@ -75,7 +83,7 @@ Grammar: TypeScript.tmLanguage
   ^
   source.ts punctuation.accessor.ts
    ^^^^^^
-   source.ts variable.function.ts
+   source.ts entity.name.function.ts
          ^
          source.ts meta.brace.round.ts
           ^
@@ -88,7 +96,7 @@ Grammar: TypeScript.tmLanguage
   ^
   source.ts punctuation.accessor.ts
    ^^^^^^^
-   source.ts variable.function.ts
+   source.ts entity.name.function.ts
           ^
           source.ts meta.brace.round.ts
            ^
@@ -96,7 +104,7 @@ Grammar: TypeScript.tmLanguage
             ^
             source.ts punctuation.accessor.ts
              ^^^^^^^^
-             source.ts variable.function.ts
+             source.ts entity.name.function.ts
                      ^
                      source.ts meta.brace.round.ts
                       ^
@@ -122,7 +130,7 @@ Grammar: TypeScript.tmLanguage
                 ^
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                  ^^^^^^^^^^^^^
-                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                               ^
                               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                ^
@@ -151,7 +159,7 @@ Grammar: TypeScript.tmLanguage
                 ^
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                  ^^^^^^^^^^^^^
-                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                               ^
                               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                                ^

tests/baselines/Issue247.baseline.txt

@@ -12,7 +12,7 @@ Grammar: TypeScriptReact.tmLanguage
  ^
  source.tsx meta.decorator.tsx punctuation.decorator.tsx
   ^^^
-  source.tsx meta.decorator.tsx variable.function.tsx
+  source.tsx meta.decorator.tsx entity.name.function.tsx
      ^
      source.tsx meta.decorator.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx
       ^

tests/baselines/Issue248.baseline.txt

@@ -121,7 +121,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts punctuation.accessor.ts
                                   ^^
-                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts
+                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts variable.other.property.ts
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                      ^
@@ -221,7 +221,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts punctuation.accessor.ts
                                   ^^
-                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts
+                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts variable.other.property.ts
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                      ^
@@ -321,7 +321,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts punctuation.accessor.ts
                                   ^^
-                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts
+                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts variable.other.property.ts
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                      ^
@@ -421,7 +421,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts punctuation.accessor.ts
                                   ^^
-                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts
+                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts variable.other.property.ts
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                      ^
@@ -521,7 +521,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts punctuation.accessor.ts
                                   ^^
-                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts
+                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts variable.other.property.ts
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                      ^
@@ -621,7 +621,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts punctuation.accessor.ts
                                   ^^
-                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts
+                                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts variable.other.property.ts
                                     ^
                                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts
                                      ^

tests/baselines/Issue250.baseline.txt

@@ -139,20 +139,22 @@ Grammar: TypeScript.tmLanguage
        ^^^^^^^^^^^^^^^^^^^^
        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts comment.line.double-slash.ts
 >    type.defineField(DesignID.Embed, new BooleanAtom(false));
- ^^^^^^^^
+ ^^^^
  source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+     ^^^^
+     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
          ^
          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
           ^^^^^^^^^^^
-          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.function.ts
+          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts entity.name.function.ts
                      ^
                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts
                       ^^^^^^^^
-                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
                               ^
                               source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                ^^^^^
-                               source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                               source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.property.ts
                                     ^
                                     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts
                                      ^
@@ -186,28 +188,32 @@ Grammar: TypeScript.tmLanguage
        ^^^^^^^^^^^^^^^^^^^^
        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts comment.line.double-slash.ts
 >    type.defineField(DesignID.Plan, PlanChoice.Original);
- ^^^^^^^^
+ ^^^^
  source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+     ^^^^
+     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
          ^
          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
           ^^^^^^^^^^^
-          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.function.ts
+          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts entity.name.function.ts
                      ^
                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts
                       ^^^^^^^^
-                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
                               ^
                               source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                ^^^^
-                               source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                               source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.property.ts
                                    ^
                                    source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts
-                                    ^^^^^^^^^^^
+                                    ^
                                     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                                     ^^^^^^^^^^
+                                     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
                                                ^
                                                source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                                 ^^^^^^^^
-                                                source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                                                source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.property.ts
                                                         ^
                                                         source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts
                                                          ^
@@ -240,20 +246,22 @@ Grammar: TypeScript.tmLanguage
                  ^
                  source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
 >      type.defineField(DesignID.Fields, new Ordering(new FieldDesign));
- ^^^^^^^^^^
+ ^^^^^^
  source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+       ^^^^
+       source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
            ^
            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
             ^^^^^^^^^^^
-            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.function.ts
+            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts entity.name.function.ts
                        ^
                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts
                         ^^^^^^^^
-                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
                                 ^
                                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                  ^^^^^^
-                                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.property.ts
                                        ^
                                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts
                                         ^
@@ -288,12 +296,16 @@ Grammar: TypeScript.tmLanguage
        ^^^^^^^^^^^^^^^^^^
        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts comment.line.double-slash.ts
 >    fields.embed = true;
- ^^^^^^^^^^
+ ^^^^
  source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+     ^^^^^^
+     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
            ^
            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
-            ^^^^^^
-            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+            ^^^^^
+            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.property.ts
+                 ^
+                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
                   ^
                   source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts keyword.operator.assignment.ts
                    ^
@@ -312,8 +324,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
      ^^^^^^
      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts keyword.control.flow.ts
-           ^^^^^
+           ^
            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+            ^^^^
+            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                 ^
                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
                  ^^

tests/baselines/Issue251.baseline.txt

@@ -32,25 +32,31 @@ Grammar: TypeScript.tmLanguage
               ^
               source.ts meta.brace.round.ts
                ^
-               source.ts
+               source.ts variable.other.readwrite.ts
                 ^
                 source.ts keyword.operator.relational.ts
-                 ^^^^^
-                 source.ts
+                 ^^^^
+                 source.ts variable.other.readwrite.ts
+                     ^
+                     source.ts
                       ^^
                       source.ts keyword.operator.logical.ts
-                        ^^
+                        ^
                         source.ts
+                         ^
+                         source.ts variable.other.readwrite.ts
                           ^
                           source.ts keyword.operator.relational.ts
                            ^^^
-                           source.ts
+                           source.ts variable.other.readwrite.ts
                               ^
                               source.ts meta.brace.round.ts
                                ^
                                source.ts punctuation.terminator.statement.ts
-                                ^^
+                                ^
                                 source.ts
+                                 ^
+                                 source.ts variable.other.readwrite.ts
                                   ^^
                                   source.ts keyword.operator.increment.ts
                                     ^
@@ -89,25 +95,31 @@ Grammar: TypeScript.tmLanguage
                   ^
                   source.ts meta.block.ts meta.brace.round.ts
                    ^
-                   source.ts meta.block.ts
+                   source.ts meta.block.ts variable.other.readwrite.ts
                     ^
                     source.ts meta.block.ts keyword.operator.relational.ts
-                     ^^^^^
-                     source.ts meta.block.ts
+                     ^^^^
+                     source.ts meta.block.ts variable.other.readwrite.ts
+                         ^
+                         source.ts meta.block.ts
                           ^^
                           source.ts meta.block.ts keyword.operator.logical.ts
-                            ^^
+                            ^
                             source.ts meta.block.ts
+                             ^
+                             source.ts meta.block.ts variable.other.readwrite.ts
                               ^
                               source.ts meta.block.ts keyword.operator.relational.ts
                                ^^^
-                               source.ts meta.block.ts
+                               source.ts meta.block.ts variable.other.readwrite.ts
                                   ^
                                   source.ts meta.block.ts meta.brace.round.ts
                                    ^
                                    source.ts meta.block.ts punctuation.terminator.statement.ts
-                                    ^^
+                                    ^
                                     source.ts meta.block.ts
+                                     ^
+                                     source.ts meta.block.ts variable.other.readwrite.ts
                                       ^^
                                       source.ts meta.block.ts keyword.operator.increment.ts
                                         ^
@@ -117,8 +129,10 @@ Grammar: TypeScript.tmLanguage
                                           ^^
                                           source.ts meta.block.ts meta.block.ts
 >    output.push( {h, w, x: k*w, y: h*j, file: file.file});
- ^^^^^^^^^^
+ ^^^^
  source.ts meta.block.ts meta.block.ts
+     ^^^^^^
+     source.ts meta.block.ts meta.block.ts variable.other.object.ts
            ^
            source.ts meta.block.ts meta.block.ts punctuation.accessor.ts
             ^^^^
@@ -145,12 +159,14 @@ Grammar: TypeScript.tmLanguage
                          source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
                           ^
                           source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
-                           ^^
+                           ^
                            source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts
+                            ^
+                            source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
                              ^
                              source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts keyword.operator.arithmetic.ts
                               ^
-                              source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts
+                              source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
                                ^
                                source.ts meta.block.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.ts
                                 ^
@@ -159,12 +175,14 @@ Grammar: TypeScript.tmLanguage
                                  source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
                                   ^
                                   source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
-                                   ^^
+                                   ^
                                    source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts
+                                    ^
+                                    source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
                                      ^
                                      source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts keyword.operator.arithmetic.ts
                                       ^
-                                      source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts
+                                      source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
                                        ^
                                        source.ts meta.block.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.ts
                                         ^
@@ -173,12 +191,14 @@ Grammar: TypeScript.tmLanguage
                                          source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
                                              ^
                                              source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
-                                              ^^^^^
+                                              ^
                                               source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts
+                                               ^^^^
+                                               source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts variable.other.object.ts
                                                    ^
                                                    source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts punctuation.accessor.ts
                                                     ^^^^
-                                                    source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts
+                                                    source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts variable.other.property.ts
                                                         ^
                                                         source.ts meta.block.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts
                                                          ^
@@ -188,8 +208,10 @@ Grammar: TypeScript.tmLanguage
                                                            ^^
                                                            source.ts meta.block.ts meta.block.ts
 >    l++;
- ^^^^^
+ ^^^^
  source.ts meta.block.ts meta.block.ts
+     ^
+     source.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
       ^^
       source.ts meta.block.ts meta.block.ts keyword.operator.increment.ts
         ^

tests/baselines/Issue252.baseline.txt

@@ -42,12 +42,18 @@ Grammar: TypeScript.tmLanguage
        source.ts meta.function.ts meta.block.ts
         ^
         source.ts meta.function.ts meta.block.ts meta.brace.round.ts
-         ^^^^^^^^^
-         source.ts meta.function.ts meta.block.ts
+         ^^^^^^^^
+         source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
+                 ^
+                 source.ts meta.function.ts meta.block.ts
                   ^^
                   source.ts meta.function.ts meta.block.ts keyword.operator.comparison.ts
-                    ^^^^^^
+                    ^
                     source.ts meta.function.ts meta.block.ts
+                     ^^^^
+                     source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
+                         ^
+                         source.ts meta.function.ts meta.block.ts
                           ^
                           source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts
                            ^
@@ -88,8 +94,12 @@ Grammar: TypeScript.tmLanguage
                                                       source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                                                        ^
                                                        source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-                                                        ^^^^^^
+                                                        ^
                                                         source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                                         ^^^^
+                                                         source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                                                             ^
+                                                             source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                                                               ^
                                                               source.ts meta.function.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
                                                                ^^

tests/baselines/Issue262.baseline.txt

@@ -32,8 +32,12 @@ Grammar: TypeScript.tmLanguage
               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
                ^
                source.ts punctuation.terminator.statement.ts
-                ^^^
+                ^
                 source.ts
+                 ^
+                 source.ts variable.other.readwrite.ts
+                  ^
+                  source.ts
                    ^
                    source.ts keyword.operator.relational.ts
                     ^
@@ -42,8 +46,10 @@ Grammar: TypeScript.tmLanguage
                      source.ts constant.numeric.decimal.ts
                        ^
                        source.ts punctuation.terminator.statement.ts
-                        ^^
+                        ^
                         source.ts
+                         ^
+                         source.ts variable.other.readwrite.ts
                           ^^
                           source.ts keyword.operator.increment.ts
                             ^
@@ -77,16 +83,24 @@ Grammar: TypeScript.tmLanguage
                   source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
                    ^
                    source.ts meta.block.ts punctuation.terminator.statement.ts
-                    ^^^
+                    ^
                     source.ts meta.block.ts
+                     ^
+                     source.ts meta.block.ts variable.other.readwrite.ts
+                      ^
+                      source.ts meta.block.ts
                        ^
                        source.ts meta.block.ts keyword.operator.relational.ts
-                        ^^
+                        ^
                         source.ts meta.block.ts
+                         ^
+                         source.ts meta.block.ts variable.other.readwrite.ts
                           ^
                           source.ts meta.block.ts punctuation.terminator.statement.ts
-                           ^^
+                           ^
                            source.ts meta.block.ts
+                            ^
+                            source.ts meta.block.ts variable.other.readwrite.ts
                              ^^
                              source.ts meta.block.ts keyword.operator.increment.ts
                                ^

tests/baselines/Issue288.baseline.txt

@@ -150,7 +150,7 @@ Grammar: TypeScript.tmLanguage
                    source.ts punctuation.terminator.statement.ts
 >functionName=1;
  ^^^^^^^^^^^^
- source.ts
+ source.ts variable.other.readwrite.ts
              ^
              source.ts keyword.operator.assignment.ts
               ^
@@ -199,7 +199,7 @@ Grammar: TypeScript.tmLanguage
                        source.ts punctuation.terminator.statement.ts
 >exportName2="hello";
  ^^^^^^^^^^^
- source.ts
+ source.ts variable.other.readwrite.ts
             ^
             source.ts keyword.operator.assignment.ts
              ^
@@ -228,7 +228,7 @@ Grammar: TypeScript.tmLanguage
                  source.ts punctuation.terminator.statement.ts
 >returnName+=1;
  ^^^^^^^^^^
- source.ts
+ source.ts variable.other.readwrite.ts
            ^^
            source.ts keyword.operator.assignment.compound.ts
              ^

tests/baselines/Issue288.txt

@@ -54,7 +54,7 @@ Grammar: TypeScript.tmLanguage
      [14, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
 >functionName=1;
  ^^^^^^^^^^^^
- [15, 9]: source.ts 
+ [15, 9]: source.ts variable.other.readwrite.ts 
 >
 >export var functionName2=1;
             ^^^^^^^^^^^^^
@@ -65,12 +65,12 @@ Grammar: TypeScript.tmLanguage
      [19, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
 >exportName2="hello";
  ^^^^^^^^^^^
- [20, 7]: source.ts 
+ [20, 7]: source.ts variable.other.readwrite.ts 
 >
 >var returnName=1;
      ^^^^^^^^^^
      [22, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
 >returnName+=1;
  ^^^^^^^^^^
- [23, 7]: source.ts 
+ [23, 7]: source.ts variable.other.readwrite.ts 
 >

tests/baselines/Issue32.baseline.txt

@@ -143,12 +143,16 @@ Grammar: TypeScript.tmLanguage
    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
        ^
        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-        ^^^^^^^^^^^^
-        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+        ^^^^^^^^^^^
+        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+                   ^
+                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
-                     ^^
+                     ^
                      source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                      ^
+                      source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
                        ^
                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
 >	}

tests/baselines/Issue335.baseline.txt

@@ -91,12 +91,16 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
 >		d.default = 1;
- ^^^
+ ^^
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+   ^
+   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
     ^
     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-     ^^^^^^^^
-     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+     ^^^^^^^
+     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+            ^
+            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
               ^
@@ -181,12 +185,16 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
 >		d.case = 1
- ^^^
+ ^^
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+   ^
+   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
     ^
     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-     ^^^^^
-     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+     ^^^^
+     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+         ^
+         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
           ^
           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
            ^
@@ -267,12 +275,16 @@ Grammar: TypeScript.tmLanguage
        ^
        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
 >		d.default = 1
- ^^^
+ ^^
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+   ^
+   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
     ^
     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-     ^^^^^^^^
-     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+     ^^^^^^^
+     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+            ^
+            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
              ^
              source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
               ^
@@ -289,11 +301,11 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
            ^
-           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
+           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.object.ts
             ^
             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts punctuation.accessor.ts
              ^^^^^^^
-             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
+             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.property.ts
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
                      ^
@@ -415,12 +427,16 @@ Grammar: TypeScript.tmLanguage
        ^
        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
 >		d.case = 1
- ^^^
+ ^^
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+   ^
+   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
     ^
     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-     ^^^^^
-     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+     ^^^^
+     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+         ^
+         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
           ^
           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
            ^
@@ -437,11 +453,11 @@ Grammar: TypeScript.tmLanguage
           ^
           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
            ^
-           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
+           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.object.ts
             ^
             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts punctuation.accessor.ts
              ^^^^^^^
-             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
+             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.property.ts
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
                      ^

tests/baselines/Issue335.txt

@@ -59,8 +59,8 @@ Grammar: TypeScript.tmLanguage
 >	b() {
 >		let d;
 >		d.default = 1;
-     ^^^^^^^^
-     [4, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts 
+     ^^^^^^^
+     [4, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts 
 >	}
 >
 >	private static c() {
@@ -75,8 +75,8 @@ Grammar: TypeScript.tmLanguage
 >	b() {
 >		let d;
 >		d.case = 1
-     ^^^^^
-     [14, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts 
+     ^^^^
+     [14, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts 
 >	}
 >
 >	private static c() {
@@ -91,11 +91,11 @@ Grammar: TypeScript.tmLanguage
 >	b() {
 >		let d
 >		d.default = 1
-     ^^^^^^^^
-     [24, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts 
+     ^^^^^^^
+     [24, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts 
 >		switch (d.default) {
              ^^^^^^^
-             [25, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts 
+             [25, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.property.ts 
 >			case 1:
     ^^^^
     [26, 4]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts 
@@ -121,11 +121,11 @@ Grammar: TypeScript.tmLanguage
 >	b() {
 >		let d
 >		d.case = 1
-     ^^^^^
-     [40, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts 
+     ^^^^
+     [40, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts 
 >		switch (d.default) {
              ^^^^^^^
-             [41, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts 
+             [41, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.property.ts 
 >			case 1:
     ^^^^
     [42, 4]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts 

tests/baselines/Issue37.baseline.txt

@@ -147,15 +147,15 @@ Grammar: TypeScript.tmLanguage
     ^
     source.ts meta.brace.round.ts
      ^^^^^^
-     source.ts
+     source.ts variable.other.object.ts
            ^
            source.ts punctuation.accessor.ts
             ^^^^^^^^^^
-            source.ts variable.function.ts
+            source.ts entity.name.function.ts
                       ^
                       source.ts meta.brace.round.ts
                        ^^^^^^^^
-                       source.ts
+                       source.ts variable.other.readwrite.ts
                                ^
                                source.ts meta.brace.round.ts
                                 ^
@@ -258,7 +258,7 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts
       ^^^^^^^^^^^^^^^
-      source.ts variable.function.ts
+      source.ts entity.name.function.ts
                      ^
                      source.ts meta.brace.round.ts
                       ^
@@ -281,12 +281,18 @@ Grammar: TypeScript.tmLanguage
        source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
         ^
         source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-         ^^^
+         ^
          source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+          ^
+          source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+           ^
+           source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
             ^
             source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
-             ^^
+             ^
              source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+              ^
+              source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                ^
                source.ts meta.block.ts punctuation.terminator.statement.ts
 >
@@ -302,7 +308,7 @@ Grammar: TypeScript.tmLanguage
          ^
          source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
           ^^^^^^^
-          source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
+          source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.readwrite.ts
                  ^
                  source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
                   ^
@@ -431,8 +437,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.block.ts meta.function.ts meta.block.ts
          ^^^^^^
          source.ts meta.block.ts meta.function.ts meta.block.ts keyword.control.flow.ts
-               ^^
+               ^
                source.ts meta.block.ts meta.function.ts meta.block.ts
+                ^
+                source.ts meta.block.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
                  ^
                  source.ts meta.block.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
 >    }
@@ -467,8 +475,10 @@ Grammar: TypeScript.tmLanguage
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
                  ^
                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-                  ^^
+                  ^
                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                   ^
+                   source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.other.ts
                     ^
                     source.ts punctuation.terminator.statement.ts
 >
@@ -515,7 +525,7 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts meta.brace.round.ts
          ^^^^^
-         source.ts
+         source.ts variable.other.readwrite.ts
               ^
               source.ts meta.brace.round.ts
 >
@@ -542,8 +552,10 @@ Grammar: TypeScript.tmLanguage
                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts
                  ^
                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts
-                  ^^^^
-                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                  ^^^
+                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+                     ^
+                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
 >interface I {}
  ^^^^^^^^^
  source.ts meta.class.ts storage.type.interface.ts
@@ -668,8 +680,10 @@ Grammar: TypeScript.tmLanguage
                         source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                          ^
                          source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
-                          ^^^^^^^
+                          ^
                           source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                           ^^^^^^
+                           source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
                                  ^
                                  source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
 >            if (typeof parent === 'object' || parent instanceof Error) {
@@ -683,8 +697,12 @@ Grammar: TypeScript.tmLanguage
                 source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
                  ^^^^^^
                  source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts
-                       ^^^^^^^^
+                       ^
                        source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                        ^^^^^^
+                        source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                              ^
+                              source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                                ^^^
                                source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
                                   ^
@@ -699,8 +717,12 @@ Grammar: TypeScript.tmLanguage
                                            source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                                             ^^
                                             source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.logical.ts
-                                              ^^^^^^^^
+                                              ^
                                               source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                                               ^^^^^^
+                                               source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
+                                                     ^
+                                                     source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                                                       ^^^^^^^^^^
                                                       source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts
                                                                 ^

tests/baselines/Issue37.txt

@@ -89,7 +89,7 @@ Grammar: TypeScript.tmLanguage
  ^^
  [6, 1]: source.ts keyword.control.conditional.ts 
             ^^^^^^^^^^
-            [6, 12]: source.ts variable.function.ts 
+            [6, 12]: source.ts entity.name.function.ts 
 >}
 >
 >class class1(){
@@ -122,7 +122,7 @@ Grammar: TypeScript.tmLanguage
  ^^^^
  [19, 1]: source.ts keyword.operator.void.ts 
       ^^^^^^^^^^^^^^^
-      [19, 6]: source.ts variable.function.ts 
+      [19, 6]: source.ts entity.name.function.ts 
 >
 >	var c = a + b;
   ^^^
@@ -206,19 +206,19 @@ Grammar: TypeScript.tmLanguage
 >            this.parent = parent;
              ^^^^
              [56, 13]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts 
-                          ^^^^^^^
-                          [56, 27]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts 
+                           ^^^^^^
+                           [56, 27]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts 
 >            if (typeof parent === 'object' || parent instanceof Error) {
                  ^^^^^^
                  [57, 17]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts 
-                       ^^^^^^^^
-                       [57, 24]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts 
+                        ^^^^^^
+                        [57, 24]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts 
                                ^^^
                                [57, 31]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts 
                                    ^
                                    [57, 35]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts 
-                                              ^^^^^^^^
-                                              [57, 47]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts 
+                                               ^^^^^^
+                                               [57, 47]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts 
                                                       ^^^^^^^^^^
                                                       [57, 54]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts 
                                                                  ^^^^^

tests/baselines/Issue42.baseline.txt

@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
                         ^
                         source.ts punctuation.accessor.ts
                          ^^^^^^^^^^^
-                         source.ts variable.function.ts
+                         source.ts entity.name.function.ts
                                     ^
                                     source.ts meta.brace.round.ts
                                      ^
@@ -46,12 +46,16 @@ Grammar: TypeScript.tmLanguage
                                                       ^^
                                                       source.ts meta.arrow.ts meta.block.ts
 >                cell.live = Math.random() < this.initialLifeProbability;
- ^^^^^^^^^^^^^^^^^^^^
+ ^^^^^^^^^^^^^^^^
  source.ts meta.arrow.ts meta.block.ts
+                 ^^^^
+                 source.ts meta.arrow.ts meta.block.ts variable.other.object.ts
                      ^
                      source.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
-                      ^^^^^
-                      source.ts meta.arrow.ts meta.block.ts
+                      ^^^^
+                      source.ts meta.arrow.ts meta.block.ts variable.other.property.ts
+                          ^
+                          source.ts meta.arrow.ts meta.block.ts
                            ^
                            source.ts meta.arrow.ts meta.block.ts keyword.operator.assignment.ts
                             ^
@@ -77,7 +81,7 @@ Grammar: TypeScript.tmLanguage
                                                  ^
                                                  source.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
                                                   ^^^^^^^^^^^^^^^^^^^^^^
-                                                  source.ts meta.arrow.ts meta.block.ts
+                                                  source.ts meta.arrow.ts meta.block.ts variable.other.property.ts
                                                                         ^
                                                                         source.ts meta.arrow.ts meta.block.ts punctuation.terminator.statement.ts
                                                                          ^^
@@ -87,8 +91,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.arrow.ts meta.block.ts
                  ^^^^^^
                  source.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts
-                       ^^^^^
+                       ^
                        source.ts meta.arrow.ts meta.block.ts
+                        ^^^^
+                        source.ts meta.arrow.ts meta.block.ts variable.other.readwrite.ts
                             ^
                             source.ts meta.arrow.ts meta.block.ts punctuation.terminator.statement.ts
                              ^^

tests/baselines/Issue43.baseline.txt

@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
             ^
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
              ^
-             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
               ^
               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                ^^^^
@@ -33,11 +33,11 @@ Grammar: TypeScript.tmLanguage
                      source.ts
 >$this.addClass("hehe");
  ^^^^^
- source.ts
+ source.ts variable.other.object.ts
       ^
       source.ts punctuation.accessor.ts
        ^^^^^^^^
-       source.ts variable.function.ts
+       source.ts entity.name.function.ts
                ^
                source.ts meta.brace.round.ts
                 ^

tests/baselines/Issue64.baseline.txt

@@ -14,27 +14,31 @@ Grammar: TypeScript.tmLanguage
 -----------------------------------
 >res.sendfile = deprecate.function(res.sendfile,
  ^^^
- source.ts
+ source.ts variable.other.object.ts
     ^
     source.ts punctuation.accessor.ts
-     ^^^^^^^^^
-     source.ts
+     ^^^^^^^^
+     source.ts variable.other.property.ts
+             ^
+             source.ts
               ^
               source.ts keyword.operator.assignment.ts
-               ^^^^^^^^^^
+               ^
                source.ts
+                ^^^^^^^^^
+                source.ts variable.other.object.ts
                          ^
                          source.ts punctuation.accessor.ts
                           ^^^^^^^^
-                          source.ts variable.function.ts
+                          source.ts entity.name.function.ts
                                   ^
                                   source.ts meta.brace.round.ts
                                    ^^^
-                                   source.ts
+                                   source.ts variable.other.object.ts
                                       ^
                                       source.ts punctuation.accessor.ts
                                        ^^^^^^^^
-                                       source.ts
+                                       source.ts variable.other.property.ts
                                                ^
                                                source.ts punctuation.separator.comma.ts
                                                 ^^
@@ -67,11 +71,13 @@ Grammar: TypeScript.tmLanguage
  source.ts
 >res.download = function download(path, filename, fn) {
  ^^^
- source.ts
+ source.ts variable.other.object.ts
     ^
     source.ts punctuation.accessor.ts
-     ^^^^^^^^^
-     source.ts
+     ^^^^^^^^
+     source.ts entity.name.function.ts
+             ^
+             source.ts
               ^
               source.ts keyword.operator.assignment.ts
                ^

tests/baselines/Issue87.baseline.txt

@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
      ^
      source.ts keyword.operator.logical.ts
       ^^^
-      source.ts
+      source.ts variable.other.object.ts
          ^
          source.ts punctuation.accessor.ts
           ^^^^
@@ -26,7 +26,7 @@ Grammar: TypeScript.tmLanguage
               ^
               source.ts punctuation.accessor.ts
                ^^^
-               source.ts
+               source.ts variable.other.property.ts
                   ^
                   source.ts meta.brace.round.ts
                    ^
@@ -47,8 +47,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.block.ts
      ^^^^^^
      source.ts meta.block.ts keyword.control.flow.ts
-           ^^^^
+           ^
            source.ts meta.block.ts
+            ^^^
+            source.ts meta.block.ts variable.other.object.ts
                ^
                source.ts meta.block.ts punctuation.accessor.ts
                 ^^^^^^

tests/baselines/Issue90.baseline.txt

@@ -60,12 +60,18 @@ Grammar: TypeScript.tmLanguage
        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
         ^
         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
-         ^^^
+         ^
          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+          ^
+          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+           ^
+           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
             ^
             source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.bitwise.ts
-             ^^
+             ^
              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+              ^
+              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                ^
                source.ts punctuation.terminator.statement.ts
 >

tests/baselines/Issue90.txt

@@ -24,12 +24,12 @@ Grammar: TypeScript.tmLanguage
  [3, 1]: source.ts 
       ^
       [3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
-         ^^^
-         [3, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+          ^
+          [3, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
             ^
             [3, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.bitwise.ts 
-             ^^
-             [3, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+              ^
+              [3, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts 
 >
  ^
  [4, 1]: source.ts 

tests/baselines/Issue96.baseline.txt

@@ -39,12 +39,12 @@ Grammar: TypeScript.tmLanguage
  source.ts
 >variable;
  ^^^^^^^^
- source.ts
+ source.ts variable.other.readwrite.ts
          ^
          source.ts punctuation.terminator.statement.ts
 >letter;
  ^^^^^^
- source.ts
+ source.ts variable.other.readwrite.ts
        ^
        source.ts punctuation.terminator.statement.ts
 >
@@ -68,8 +68,10 @@ Grammar: TypeScript.tmLanguage
                    ^
                    source.ts punctuation.terminator.statement.ts
 >constenum += 10;
- ^^^^^^^^^^
- source.ts
+ ^^^^^^^^^
+ source.ts variable.other.readwrite.ts
+          ^
+          source.ts
            ^^
            source.ts keyword.operator.assignment.compound.ts
              ^
@@ -122,8 +124,10 @@ Grammar: TypeScript.tmLanguage
                                    ^
                                    source.ts punctuation.terminator.statement.ts
 >constable += " Royal, I say!";
- ^^^^^^^^^^
- source.ts
+ ^^^^^^^^^
+ source.ts variable.other.readwrite.ts
+          ^
+          source.ts
            ^^
            source.ts keyword.operator.assignment.compound.ts
              ^

tests/baselines/Issue96.txt

@@ -25,10 +25,10 @@ Grammar: TypeScript.tmLanguage
 >
 >variable;
  ^^^^^^^^
- [4, 4]: source.ts 
+ [4, 4]: source.ts variable.other.readwrite.ts 
 >letter;
  ^^^^^^
- [5, 4]: source.ts 
+ [5, 4]: source.ts variable.other.readwrite.ts 
 >
 >var constenum = 10;
      ^^^^^^^^^
@@ -36,10 +36,10 @@ Grammar: TypeScript.tmLanguage
               ^
               [7, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
 >constenum += 10;
- ^^^^^^^^^^
- [8, 6]: source.ts 
- ^^^^^^^^^^
- [8, 10]: source.ts 
+ ^^^^^^^^^
+ [8, 6]: source.ts variable.other.readwrite.ts 
+          ^
+          [8, 10]: source.ts 
 >const enum E { }
       ^
       [9, 6]: source.ts meta.enum.declaration.ts 
@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage
               ^
               [11, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
 >constable += " Royal, I say!";
- ^^^^^^^^^^
- [12, 6]: source.ts 
- ^^^^^^^^^^
- [12, 10]: source.ts 
+ ^^^^^^^^^
+ [12, 6]: source.ts variable.other.readwrite.ts 
+          ^
+          [12, 10]: source.ts 

tests/baselines/ParameterProperties.baseline.txt

@@ -108,8 +108,10 @@ Grammar: TypeScript.tmLanguage
           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
               ^
               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-               ^^
-               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+               ^
+               source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+                ^
+                source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                  ^
                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.arithmetic.ts
                   ^
@@ -118,8 +120,10 @@ Grammar: TypeScript.tmLanguage
                    source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
                        ^
                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
-                        ^^
-                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                        ^
+                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
+                         ^
+                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                           ^
                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.arithmetic.ts
                            ^
@@ -129,7 +133,7 @@ Grammar: TypeScript.tmLanguage
                                 ^
                                 source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
                                  ^
-                                 source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                                 source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
                                   ^
                                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
 >	}

tests/baselines/TsxSamples.baseline.txt

@@ -133,7 +133,7 @@ Grammar: TypeScriptReact.tmLanguage
                                   ^
                                   source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.accessor.tsx
                                    ^^^^
-                                   source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
+                                   source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx variable.other.property.tsx
                                        ^
                                        source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
                                         ^
@@ -148,11 +148,11 @@ Grammar: TypeScriptReact.tmLanguage
                                   ^
                                   source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.accessor.tsx
                                    ^^^^^
-                                   source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.brace.curly.tsx
+                                   source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.other.object.property.tsx
                                         ^
                                         source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.accessor.tsx
                                          ^^^^^
-                                         source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.brace.curly.tsx
+                                         source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.other.property.tsx
                                               ^
                                               source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
 >        </div>
@@ -440,8 +440,10 @@ Grammar: TypeScriptReact.tmLanguage
                        source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx meta.brace.curly.tsx support.variable.dom.tsx
                              ^
                              source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.accessor.tsx
-                              ^^^^^^^^^^^
-                              source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx meta.brace.curly.tsx
+                              ^^^^^^^^^^
+                              source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx meta.brace.curly.tsx variable.other.property.tsx
+                                        ^
+                                        source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx meta.brace.curly.tsx
                                          ^
                                          source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx meta.brace.curly.tsx keyword.operator.ternary.tsx
                                           ^
@@ -517,28 +519,36 @@ Grammar: TypeScriptReact.tmLanguage
                source.tsx punctuation.terminator.statement.tsx
 >props.foo = x;
  ^^^^^
- source.tsx
+ source.tsx variable.other.object.tsx
       ^
       source.tsx punctuation.accessor.tsx
-       ^^^^
-       source.tsx
+       ^^^
+       source.tsx variable.other.property.tsx
+          ^
+          source.tsx
            ^
            source.tsx keyword.operator.assignment.tsx
-            ^^
+            ^
             source.tsx
+             ^
+             source.tsx variable.other.readwrite.tsx
               ^
               source.tsx punctuation.terminator.statement.tsx
 >props.bar = y;
  ^^^^^
- source.tsx
+ source.tsx variable.other.object.tsx
       ^
       source.tsx punctuation.accessor.tsx
-       ^^^^
-       source.tsx
+       ^^^
+       source.tsx variable.other.property.tsx
+          ^
+          source.tsx
            ^
            source.tsx keyword.operator.assignment.tsx
-            ^^
+            ^
             source.tsx
+             ^
+             source.tsx variable.other.readwrite.tsx
               ^
               source.tsx punctuation.terminator.statement.tsx
 >var component = <Component {...props} />;
@@ -569,7 +579,7 @@ Grammar: TypeScriptReact.tmLanguage
                                ^
                                source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.accessor.tsx
                                 ^^^^^
-                                source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx
+                                source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx variable.other.property.tsx
                                      ^
                                      source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
                                       ^
@@ -642,7 +652,7 @@ Grammar: TypeScriptReact.tmLanguage
                                 ^
                                 source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.accessor.tsx
                                  ^^^^^
-                                 source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx
+                                 source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx variable.other.property.tsx
                                       ^
                                       source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
                                        ^

tests/baselines/arrow.baseline.txt

@@ -130,8 +130,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.function.ts meta.block.ts meta.arrow.ts meta.block.ts
          ^^^^^^
          source.ts meta.function.ts meta.block.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts
-               ^^
+               ^
                source.ts meta.function.ts meta.block.ts meta.arrow.ts meta.block.ts
+                ^
+                source.ts meta.function.ts meta.block.ts meta.arrow.ts meta.block.ts variable.other.readwrite.ts
                  ^
                  source.ts meta.function.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.terminator.statement.ts
                   ^^

tests/baselines/arrowInsideCall.baseline.txt

@@ -7,7 +7,7 @@ Grammar: TypeScript.tmLanguage
 -----------------------------------
 >optsList.sort((a, b) => compareValues<string>(a.name.toLowerCase(), b.name.toLowerCase()));
  ^^^^^^^^
- source.ts
+ source.ts variable.other.object.ts
          ^
          source.ts punctuation.accessor.ts
           ^^^^
@@ -33,7 +33,7 @@ Grammar: TypeScript.tmLanguage
                         ^
                         source.ts meta.arrow.ts
                          ^^^^^^^^^^^^^
-                         source.ts variable.function.ts
+                         source.ts entity.name.function.ts
                                       ^
                                       source.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
                                        ^^^^^^
@@ -43,7 +43,7 @@ Grammar: TypeScript.tmLanguage
                                               ^
                                               source.ts meta.brace.round.ts
                                                ^
-                                               source.ts
+                                               source.ts variable.other.object.ts
                                                 ^
                                                 source.ts punctuation.accessor.ts
                                                  ^^^^
@@ -58,8 +58,10 @@ Grammar: TypeScript.tmLanguage
                                                                   source.ts meta.brace.round.ts
                                                                    ^
                                                                    source.ts punctuation.separator.comma.ts
-                                                                    ^^
+                                                                    ^
                                                                     source.ts
+                                                                     ^
+                                                                     source.ts variable.other.object.ts
                                                                       ^
                                                                       source.ts punctuation.accessor.ts
                                                                        ^^^^

tests/baselines/awaitColoring.baseline.txt

@@ -18,8 +18,10 @@ Grammar: TypeScript.tmLanguage
          ^^
          source.ts
 >awaiting 1;
- ^^^^^^^^^
- source.ts
+ ^^^^^^^^
+ source.ts variable.other.readwrite.ts
+         ^
+         source.ts
           ^
           source.ts constant.numeric.decimal.ts
            ^

tests/baselines/awaitColoring.txt

@@ -10,5 +10,5 @@ Grammar: TypeScript.tmLanguage
  ^^^^^
  [1, 1]: source.ts keyword.control.flow.ts 
 >awaiting 1;
- ^^^^^^^^^
- [2, 1]: source.ts 
+ ^^^^^^^^
+ [2, 1]: source.ts variable.other.readwrite.ts 

tests/baselines/generator.baseline.txt

@@ -242,11 +242,11 @@ Grammar: TypeScript.tmLanguage
       ^
       source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
        ^
-       source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
+       source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts variable.other.readwrite.ts
         ^
         source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts keyword.operator.arithmetic.ts
          ^
-         source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
+         source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts variable.other.readwrite.ts
           ^
           source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
            ^
@@ -416,8 +416,10 @@ Grammar: TypeScript.tmLanguage
  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
          ^^^^^^
          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
-               ^^^
+               ^
                source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+                ^^
+                source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts
                   ^
                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
                    ^^

tests/baselines/javascript.baseline.txt

@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
          ^
-         source.ts switch-statement.expr.ts switch-expression.expr.ts
+         source.ts switch-statement.expr.ts switch-expression.expr.ts variable.other.readwrite.ts
           ^
           source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
            ^
@@ -59,8 +59,10 @@ Grammar: TypeScript.tmLanguage
 >typeof x;
  ^^^^^^
  source.ts keyword.operator.typeof.ts
-       ^^
+       ^
        source.ts
+        ^
+        source.ts variable.other.readwrite.ts
          ^
          source.ts punctuation.terminator.statement.ts
           ^^
@@ -68,8 +70,10 @@ Grammar: TypeScript.tmLanguage
 >void x;
  ^^^^
  source.ts keyword.operator.void.ts
-     ^^
+     ^
      source.ts
+      ^
+      source.ts variable.other.readwrite.ts
        ^
        source.ts punctuation.terminator.statement.ts
         ^^
@@ -77,8 +81,10 @@ Grammar: TypeScript.tmLanguage
 >delete x.y;
  ^^^^^^
  source.ts keyword.operator.delete.ts
-       ^^
+       ^
        source.ts
+        ^
+        source.ts variable.other.object.ts
          ^
          source.ts punctuation.accessor.ts
           ^
@@ -88,11 +94,15 @@ Grammar: TypeScript.tmLanguage
             ^^
             source.ts
 >x instanceof y;
- ^^
- source.ts
+ ^
+ source.ts variable.other.readwrite.ts
+  ^
+  source.ts
    ^^^^^^^^^^
    source.ts keyword.operator.instanceof.ts
-             ^^
+             ^
              source.ts
+              ^
+              source.ts variable.other.readwrite.ts
                ^
                source.ts punctuation.terminator.statement.ts

tests/baselines/parameterBindingPattern.baseline.txt

@@ -363,7 +363,7 @@ Grammar: TypeScript.tmLanguage
                                                           ^
                                                           source.ts meta.function.ts meta.parameters.ts
                                                            ^^^
-                                                           source.ts meta.function.ts meta.parameters.ts variable.function.ts
+                                                           source.ts meta.function.ts meta.parameters.ts entity.name.function.ts
                                                               ^
                                                               source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts
                                                                ^
@@ -633,7 +633,7 @@ Grammar: TypeScript.tmLanguage
     ^
     source.ts meta.function.ts meta.parameters.ts
      ^^^
-     source.ts meta.function.ts meta.parameters.ts variable.function.ts
+     source.ts meta.function.ts meta.parameters.ts entity.name.function.ts
         ^
         source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts
          ^
@@ -784,7 +784,7 @@ Grammar: TypeScript.tmLanguage
                                  ^
                                  source.ts meta.function.ts meta.parameters.ts
                                   ^^^
-                                  source.ts meta.function.ts meta.parameters.ts variable.function.ts
+                                  source.ts meta.function.ts meta.parameters.ts entity.name.function.ts
                                      ^
                                      source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts
                                       ^
@@ -864,7 +864,7 @@ Grammar: TypeScript.tmLanguage
                                                               ^
                                                               source.ts meta.function.ts meta.parameters.ts
                                                                ^^^
-                                                               source.ts meta.function.ts meta.parameters.ts variable.function.ts
+                                                               source.ts meta.function.ts meta.parameters.ts entity.name.function.ts
                                                                   ^
                                                                   source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts
                                                                    ^

tests/baselines/pr48_noSemiColon.baseline.txt

@@ -156,11 +156,11 @@ Grammar: TypeScript.tmLanguage
                      ^
                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                       ^^^^^^^
-                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                              ^
                              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
                               ^^^
-                              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
                                  ^
                                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
 >
@@ -224,7 +224,7 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts meta.function.ts meta.block.ts
          ^^^^
-         source.ts meta.function.ts meta.block.ts variable.function.ts
+         source.ts meta.function.ts meta.block.ts entity.name.function.ts
              ^
              source.ts meta.function.ts meta.block.ts meta.brace.round.ts
               ^^^^
@@ -234,7 +234,7 @@ Grammar: TypeScript.tmLanguage
                    ^
                    source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                     ^^^^
-                    source.ts meta.function.ts meta.block.ts variable.function.ts
+                    source.ts meta.function.ts meta.block.ts entity.name.function.ts
                         ^
                         source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                          ^^^^
@@ -246,11 +246,11 @@ Grammar: TypeScript.tmLanguage
                                 ^
                                 source.ts meta.function.ts meta.block.ts meta.arrow.ts
                                  ^^^^
-                                 source.ts meta.function.ts meta.block.ts
+                                 source.ts meta.function.ts meta.block.ts variable.other.object.ts
                                      ^
                                      source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
                                       ^^^^^^
-                                      source.ts meta.function.ts meta.block.ts variable.function.ts
+                                      source.ts meta.function.ts meta.block.ts entity.name.function.ts
                                             ^
                                             source.ts meta.function.ts meta.block.ts meta.brace.round.ts
                                              ^
@@ -300,7 +300,7 @@ Grammar: TypeScript.tmLanguage
                         ^
                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                          ^^^^^^^
-                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                         source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                 ^
                                 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
                                  ^^^^^^
@@ -326,7 +326,7 @@ Grammar: TypeScript.tmLanguage
                                                            ^
                                                            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                                             ^^^^^^^^
-                                                            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                                            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.property.ts
                                                                     ^
                                                                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
 >export const writeFile = thenify<string, string | Buffer, void>(fs.writeFile)
@@ -347,7 +347,7 @@ Grammar: TypeScript.tmLanguage
                          ^
                          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                           ^^^^^^^
-                          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.function.ts
+                          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts
                                  ^
                                  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
                                   ^^^^^^
@@ -381,7 +381,7 @@ Grammar: TypeScript.tmLanguage
                                                                    ^
                                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
                                                                     ^^^^^^^^^
-                                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+                                                                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.property.ts
                                                                              ^
                                                                              source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
 >

tests/baselines/variableBindingPattern.baseline.txt

@@ -355,7 +355,7 @@ Grammar: TypeScript.tmLanguage
                                                 ^
                                                 source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
                                                  ^^^
-                                                 source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.function.ts
+                                                 source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts entity.name.function.ts
                                                     ^
                                                     source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts
                                                      ^
@@ -612,7 +612,7 @@ Grammar: TypeScript.tmLanguage
     ^
     source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
      ^^^
-     source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.function.ts
+     source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts entity.name.function.ts
         ^
         source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts
          ^
@@ -750,7 +750,7 @@ Grammar: TypeScript.tmLanguage
                        ^
                        source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
                         ^^^
-                        source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.function.ts
+                        source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts entity.name.function.ts
                            ^
                            source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts
                             ^
@@ -817,7 +817,7 @@ Grammar: TypeScript.tmLanguage
                                                     ^
                                                     source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
                                                      ^^^
-                                                     source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.function.ts
+                                                     source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts entity.name.function.ts
                                                         ^
                                                         source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts
                                                          ^