Add scope for label name if identifier follows break/continue/goto

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -155,6 +155,10 @@ repository:
     - include: '#for-loop'
     - name: keyword.control.trycatch.ts
       match: '{{startOfIdentifier}}(catch|finally|throw|try){{endOfIdentifier}}'
+    - match: '{{startOfIdentifier}}(break|continue|goto)\s+({{identifier}}){{endOfIdentifier}}'
+      captures:
+        '1': { name: keyword.control.loop.ts }
+        '2': { name: entity.name.label.ts }
     - name: keyword.control.loop.ts
       match: '{{startOfIdentifier}}(break|continue|do|goto|while){{endOfIdentifier}}'
     - name: keyword.control.flow.ts

TypeScript.tmLanguage

@@ -153,6 +153,23 @@
             <key>match</key>
             <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(catch|finally|throw|try)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
           </dict>
+          <dict>
+            <key>match</key>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(break|continue|goto)\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.control.loop.ts</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>entity.name.label.ts</string>
+              </dict>
+            </dict>
+          </dict>
           <dict>
             <key>name</key>
             <string>keyword.control.loop.ts</string>

TypeScriptReact.tmLanguage

@@ -153,6 +153,23 @@
             <key>match</key>
             <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(catch|finally|throw|try)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
           </dict>
+          <dict>
+            <key>match</key>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(break|continue|goto)\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.control.loop.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>entity.name.label.tsx</string>
+              </dict>
+            </dict>
+          </dict>
           <dict>
             <key>name</key>
             <string>keyword.control.loop.tsx</string>

tests/baselines/Issue610.baseline.txt

@@ -96,7 +96,7 @@ 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 variable.other.readwrite.ts
+             source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts entity.name.label.ts
                  ^
                  source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.terminator.statement.ts
 >    }