Add comment matching in switch clause

Fixes #666

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -1162,6 +1162,7 @@ repository:
     endCaptures:
       '0': {name: punctuation.definition.block.ts}
     patterns:
+    - include: '#comment'
     - name: switch-expression.expr.ts
       begin: '{{startOfIdentifier}}(switch)\s*(\()'
       beginCaptures:

TypeScript.tmLanguage

@@ -3749,6 +3749,10 @@
         </dict>
         <key>patterns</key>
         <array>
+          <dict>
+            <key>include</key>
+            <string>#comment</string>
+          </dict>
           <dict>
             <key>name</key>
             <string>switch-expression.expr.ts</string>

TypeScriptReact.tmLanguage

@@ -3753,6 +3753,10 @@
         </dict>
         <key>patterns</key>
         <array>
+          <dict>
+            <key>include</key>
+            <string>#comment</string>
+          </dict>
           <dict>
             <key>name</key>
             <string>switch-expression.expr.tsx</string>

tests/baselines/Issue666.baseline.txt

@@ -0,0 +1,32 @@
+original file
+-----------------------------------
+switch (0) // discard and renew state per mode
+{
+}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>switch (0) // discard and renew state per mode
+ ^^^^^^
+ source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
+       ^
+       source.ts switch-statement.expr.ts switch-expression.expr.ts
+        ^
+        source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+         ^
+         source.ts switch-statement.expr.ts switch-expression.expr.ts constant.numeric.decimal.ts
+          ^
+          source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+           ^
+           source.ts switch-statement.expr.ts
+            ^^
+            source.ts switch-statement.expr.ts comment.line.double-slash.ts punctuation.definition.comment.ts
+              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+              source.ts switch-statement.expr.ts comment.line.double-slash.ts
+>{
+ ^
+ source.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
+>}
+ ^
+ source.ts switch-statement.expr.ts punctuation.definition.block.ts

tests/cases/Issue666.ts

@@ -0,0 +1,3 @@
+switch (0) // discard and renew state per mode
+{
+}