Fix this literal matching with spread operator

Fixes #502

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -2023,7 +2023,7 @@ repository:
 
   this-literal:
     name: variable.language.this.ts
-    match: (?<!\.|\$)\bthis\b(?!\$)
+    match: (?<!\$)((?<=\.\.\.)|(?<!\.))\bthis\b(?!\$)
 
   super-literal:
     name: variable.language.super.ts

TypeScript.tmLanguage

@@ -5574,7 +5574,7 @@
         <key>name</key>
         <string>variable.language.this.ts</string>
         <key>match</key>
-        <string>(?&lt;!\.|\$)\bthis\b(?!\$)</string>
+        <string>(?&lt;!\$)((?&lt;=\.\.\.)|(?&lt;!\.))\bthis\b(?!\$)</string>
       </dict>
       <key>super-literal</key>
       <dict>

TypeScriptReact.tmLanguage

@@ -5520,7 +5520,7 @@
         <key>name</key>
         <string>variable.language.this.tsx</string>
         <key>match</key>
-        <string>(?&lt;!\.|\$)\bthis\b(?!\$)</string>
+        <string>(?&lt;!\$)((?&lt;=\.\.\.)|(?&lt;!\.))\bthis\b(?!\$)</string>
       </dict>
       <key>super-literal</key>
       <dict>

tests/baselines/Issue502.baseline.txt

@@ -0,0 +1,100 @@
+original file
+-----------------------------------
+class Foo {
+    bar () {
+        [...this.foobar()];
+        [... this.foobar()];
+    }
+}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>class Foo {
+ ^^^^^
+ source.ts meta.class.ts storage.type.class.ts
+      ^
+      source.ts meta.class.ts
+       ^^^
+       source.ts meta.class.ts entity.name.type.class.ts
+          ^
+          source.ts meta.class.ts
+           ^
+           source.ts meta.class.ts punctuation.definition.block.ts
+            ^^
+            source.ts meta.class.ts
+>    bar () {
+ ^^^^
+ source.ts meta.class.ts
+     ^^^
+     source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
+        ^
+        source.ts meta.class.ts meta.method.declaration.ts
+         ^
+         source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+          ^
+          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+           ^
+           source.ts meta.class.ts meta.method.declaration.ts
+            ^
+            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
+             ^^
+             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
+>        [...this.foobar()];
+ ^^^^^^^^
+ 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.array.literal.ts meta.brace.square.ts
+          ^^^
+          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts keyword.operator.spread.ts
+             ^^^^
+             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.function-call.ts variable.language.this.ts
+                 ^
+                 source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.function-call.ts punctuation.accessor.ts
+                  ^^^^^^
+                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.function-call.ts entity.name.function.ts
+                        ^
+                        source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
+                         ^
+                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
+                          ^
+                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.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
+>        [... this.foobar()];
+ ^^^^^^^^
+ 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.array.literal.ts meta.brace.square.ts
+          ^^^
+          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts keyword.operator.spread.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 meta.function-call.ts variable.language.this.ts
+                  ^
+                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.function-call.ts punctuation.accessor.ts
+                   ^^^^^^
+                   source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.function-call.ts entity.name.function.ts
+                         ^
+                         source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
+                          ^
+                          source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
+                           ^
+                           source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.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
+     ^
+     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
+      ^^
+      source.ts meta.class.ts
+>}
+ ^
+ source.ts meta.class.ts punctuation.definition.block.ts

tests/cases/Issue502.ts

@@ -0,0 +1,6 @@
+class Foo {
+    bar () {
+        [...this.foobar()];
+        [... this.foobar()];
+    }
+}