Add return as a look ahead to end the statement

Fixes #592

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -16,6 +16,7 @@ variables:
   nonIdentifierPropertyName: '{{quotedStrings}}|(\[([^\[\]]|\[[^\[\]]*\])+\])'
   propertyName: (({{identifier}})|{{nonIdentifierPropertyName}})
   constantVar: ({{constantIdentifier}})(?![_$[:alnum:]])
+  endOfStatement: ';|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b'
   nonPropertyLookBehind: '[^\._$[:alnum:]]'
   lookBehindReturn: '^return|{{nonPropertyLookBehind}}return'
   lookBehindThrow: '^throw|{{nonPropertyLookBehind}}throw'
@@ -808,7 +809,7 @@ repository:
     beginCaptures:
       '1': { name: keyword.control.export.ts }
       '2': { name: storage.type.namespace.ts }
-    end: (?<=\})|(?=;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)
+    end: (?<=\})|(?={{endOfStatement}})
     patterns:
     - include: '#comment'
     - include: '#string'
@@ -825,7 +826,7 @@ repository:
       '1': { name: keyword.control.export.ts }
       '2': { name: storage.type.type.ts }
       '3': { name: entity.name.type.alias.ts }
-    end: (?=[};]|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)
+    end: (?=\}|{{endOfStatement}})
     patterns:
       - include: '#comment'
       - include: '#type-parameters'
@@ -902,14 +903,14 @@ repository:
         '1': { name: keyword.control.export.ts }
         '2': { name: keyword.operator.assignment.ts }
         '3': { name: keyword.control.default.ts }
-      end: (?=;|$|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)
+      end: (?=$|{{endOfStatement}})
       patterns:
       - include: '#expression'
     - name: meta.export.ts
       begin: '{{startOfIdentifier}}(export)(?!\s*:){{endOfIdentifier}}'
       beginCaptures:
         '0': { name: keyword.control.export.ts }
-      end: (?=;|$|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)
+      end: (?=$|{{endOfStatement}})
       patterns:
       - include: '#import-export-declaration'
 

TypeScript.tmLanguage

@@ -2487,7 +2487,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;=\})|(?=;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+        <string>(?&lt;=\})|(?=;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2539,7 +2539,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=[};]|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+        <string>(?=\}|;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2813,7 +2813,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=;|$|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+            <string>(?=$|;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -2836,7 +2836,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=;|$|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+            <string>(?=$|;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
             <key>patterns</key>
             <array>
               <dict>

TypeScriptReact.tmLanguage

@@ -2491,7 +2491,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;=\})|(?=;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+        <string>(?&lt;=\})|(?=;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2543,7 +2543,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=[};]|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+        <string>(?=\}|;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2817,7 +2817,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=;|$|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+            <string>(?=$|;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -2840,7 +2840,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=;|$|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\btype\b|\bvar\b)</string>
+            <string>(?=$|;|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b)</string>
             <key>patterns</key>
             <array>
               <dict>

tests/baselines/Issue592.baseline.txt

@@ -0,0 +1,68 @@
+original file
+-----------------------------------
+function test() {
+  type X = { }
+  return {};
+}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>function test() {
+ ^^^^^^^^
+ source.ts meta.function.ts storage.type.function.ts
+         ^
+         source.ts meta.function.ts
+          ^^^^
+          source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
+              ^
+              source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+               ^
+               source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+                ^
+                source.ts meta.function.ts
+                 ^
+                 source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
+                  ^^
+                  source.ts meta.function.ts meta.block.ts
+>  type X = { }
+ ^^
+ source.ts meta.function.ts meta.block.ts
+   ^^^^
+   source.ts meta.function.ts meta.block.ts meta.type.declaration.ts storage.type.type.ts
+       ^
+       source.ts meta.function.ts meta.block.ts meta.type.declaration.ts
+        ^
+        source.ts meta.function.ts meta.block.ts meta.type.declaration.ts entity.name.type.alias.ts
+         ^
+         source.ts meta.function.ts meta.block.ts meta.type.declaration.ts
+          ^
+          source.ts meta.function.ts meta.block.ts meta.type.declaration.ts keyword.operator.assignment.ts
+           ^
+           source.ts meta.function.ts meta.block.ts meta.type.declaration.ts
+            ^
+            source.ts meta.function.ts meta.block.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts
+             ^
+             source.ts meta.function.ts meta.block.ts meta.type.declaration.ts meta.object.type.ts
+              ^
+              source.ts meta.function.ts meta.block.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts
+               ^^
+               source.ts meta.function.ts meta.block.ts meta.type.declaration.ts
+>  return {};
+ ^^
+ source.ts meta.function.ts meta.block.ts meta.type.declaration.ts
+   ^^^^^^
+   source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
+         ^
+         source.ts meta.function.ts meta.block.ts meta.objectliteral.ts
+          ^
+          source.ts meta.function.ts meta.block.ts meta.objectliteral.ts punctuation.definition.block.ts
+           ^
+           source.ts meta.function.ts meta.block.ts meta.objectliteral.ts punctuation.definition.block.ts
+            ^
+            source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
+             ^^
+             source.ts meta.function.ts meta.block.ts
+>}
+ ^
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts

tests/cases/Issue592.ts

@@ -0,0 +1,4 @@
+function test() {
+  type X = { }
+  return {};
+}