Fix scope extensions for .tsx shebang

Fixes #813

TypeScript.YAML-tmLanguage

@@ -140,12 +140,15 @@ variables:
 patterns:
 - include: '#directives'
 - include: '#statements'
-- name: comment.line.shebang.ts
-  match: \A(#!).*(?=$)
-  captures:
-    '1': { name: punctuation.definition.comment.ts }
+- include: '#shebang'
 
 repository:
+  shebang:
+    name: comment.line.shebang.ts
+    match: \A(#!).*(?=$)
+    captures:
+      '1': { name: punctuation.definition.comment.ts }
+
   statements:
     patterns:
     - include: '#declaration'

TypeScript.tmLanguage

@@ -22,6 +22,14 @@
         <key>include</key>
         <string>#statements</string>
       </dict>
+      <dict>
+        <key>include</key>
+        <string>#shebang</string>
+      </dict>
+    </array>
+    <key>repository</key>
+    <dict>
+      <key>shebang</key>
       <dict>
         <key>name</key>
         <string>comment.line.shebang.ts</string>
@@ -36,9 +44,6 @@
           </dict>
         </dict>
       </dict>
-    </array>
-    <key>repository</key>
-    <dict>
       <key>statements</key>
       <dict>
         <key>patterns</key>

TypeScriptReact.tmLanguage

@@ -22,9 +22,17 @@
         <key>include</key>
         <string>#statements</string>
       </dict>
+      <dict>
+        <key>include</key>
+        <string>#shebang</string>
+      </dict>
+    </array>
+    <key>repository</key>
+    <dict>
+      <key>shebang</key>
       <dict>
         <key>name</key>
-        <string>comment.line.shebang.ts</string>
+        <string>comment.line.shebang.tsx</string>
         <key>match</key>
         <string>\A(#!).*(?=$)</string>
         <key>captures</key>
@@ -32,13 +40,10 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.definition.comment.ts</string>
+            <string>punctuation.definition.comment.tsx</string>
           </dict>
         </dict>
       </dict>
-    </array>
-    <key>repository</key>
-    <dict>
       <key>statements</key>
       <dict>
         <key>patterns</key>

tests/baselines/Issue337.baseline.txt

@@ -9,13 +9,4 @@ Grammar: TypeScript.tmLanguage
  ^^
  source.ts comment.line.shebang.ts punctuation.definition.comment.ts
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   source.ts comment.line.shebang.ts
-
-
-Grammar: TypeScriptReact.tmLanguage
------------------------------------
->#!/usr/bin/env node -r babel-register
- ^^
- source.tsx comment.line.shebang.ts punctuation.definition.comment.ts INCORRECT_SCOPE_EXTENSION
-   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   source.tsx comment.line.shebang.ts INCORRECT_SCOPE_EXTENSION
+   source.ts comment.line.shebang.ts