Handle incorrect order of string and comment matching

Fixes #793

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -141,15 +141,15 @@ patterns:
 repository:
   statements:
     patterns:
-    - include: '#string'
-    - include: '#comment'
     - include: '#declaration'
     - include: '#control-statement'
     - include: '#after-operator-block-as-object-literal'
     - include: '#decl-block'
     - include: '#label'
     - include: '#expression'
     - include: '#punctuation-semicolon'
+    - include: '#string'
+    - include: '#comment'
 
   declaration:
     patterns:

TypeScript.tmLanguage

@@ -43,14 +43,6 @@
       <dict>
         <key>patterns</key>
         <array>
-          <dict>
-            <key>include</key>
-            <string>#string</string>
-          </dict>
-          <dict>
-            <key>include</key>
-            <string>#comment</string>
-          </dict>
           <dict>
             <key>include</key>
             <string>#declaration</string>
@@ -79,6 +71,14 @@
             <key>include</key>
             <string>#punctuation-semicolon</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#string</string>
+          </dict>
+          <dict>
+            <key>include</key>
+            <string>#comment</string>
+          </dict>
         </array>
       </dict>
       <key>declaration</key>

TypeScriptReact.tmLanguage

@@ -43,14 +43,6 @@
       <dict>
         <key>patterns</key>
         <array>
-          <dict>
-            <key>include</key>
-            <string>#string</string>
-          </dict>
-          <dict>
-            <key>include</key>
-            <string>#comment</string>
-          </dict>
           <dict>
             <key>include</key>
             <string>#declaration</string>
@@ -79,6 +71,14 @@
             <key>include</key>
             <string>#punctuation-semicolon</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#string</string>
+          </dict>
+          <dict>
+            <key>include</key>
+            <string>#comment</string>
+          </dict>
         </array>
       </dict>
       <key>declaration</key>

tests/baselines/Issue793.baseline.txt

@@ -0,0 +1,18 @@
+original file
+-----------------------------------
+return`tagged string`;
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>return`tagged string`;
+ ^^^^^^
+ source.ts keyword.control.flow.ts
+       ^
+       source.ts string.template.ts punctuation.definition.string.template.begin.ts
+        ^^^^^^^^^^^^^
+        source.ts string.template.ts
+                     ^
+                     source.ts string.template.ts punctuation.definition.string.template.end.ts
+                      ^
+                      source.ts punctuation.terminator.statement.ts

tests/cases/Issue793.ts

@@ -0,0 +1 @@
+return`tagged string`;