Merge pull request #272 from Microsoft/returnTypeEndRegex

Fix the end expression regex for return type

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -63,10 +63,10 @@ repository:
       end: (?=$|[;,}]|(\s+(of|in)\s+))
       patterns:
       - include: '#variable-initializer'
-      - begin: \G
-        end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
+      - begin: (?<=\{)
+        end: (?=$|[;,=}]|(\s+(of|in)\s+))
         patterns:
-        - begin: \G
+        - begin: (?<=\{)
           end: \}
           endCaptures:
             '0': { name: punctuation.definition.binding-pattern.object.ts }
@@ -81,10 +81,10 @@ repository:
       end: (?=$|[;,}]|(\s+(of|in)\s+))
       patterns:
       - include: '#variable-initializer'
-      - begin: \G
-        end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
+      - begin: (?<=\[)
+        end: (?=$|[;,=}]|(\s+(of|in)\s+))
         patterns:
-        - begin: \G
+        - begin: (?<=\[)
           end: \]
           endCaptures:
             '0': { name: punctuation.definition.binding-pattern.array.ts }
@@ -690,7 +690,7 @@ repository:
     begin: '(?<=\))\s*(:)'
     beginCaptures:
       '1': { name: keyword.operator.type.annotation.ts }
-    end: (?<!:)((?=$)|(?=\{|;|//))
+    end: (?<!:)((?=$)|(?=\{|;|//|\}))
     patterns:
     - include: '#comment'
     # Handle returning of object type specifically here so as to not confuse it with the start of function block
@@ -1312,7 +1312,7 @@ repository:
       end: (?=,|\})
       patterns:
       - name: meta.object-literal.key.ts
-        begin: \G(?<!:)
+        begin: (?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*:)
         end: ':'
         endCaptures:
           '0': { name: punctuation.separator.key-value.ts }

TypeScript.tmLanguage

@@ -192,14 +192,14 @@
               </dict>
               <dict>
                 <key>begin</key>
-                <string>\G</string>
+                <string>(?&lt;=\{)</string>
                 <key>end</key>
-                <string>(?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))</string>
+                <string>(?=$|[;,=}]|(\s+(of|in)\s+))</string>
                 <key>patterns</key>
                 <array>
                   <dict>
                     <key>begin</key>
-                    <string>\G</string>
+                    <string>(?&lt;=\{)</string>
                     <key>end</key>
                     <string>\}</string>
                     <key>endCaptures</key>
@@ -253,14 +253,14 @@
               </dict>
               <dict>
                 <key>begin</key>
-                <string>\G</string>
+                <string>(?&lt;=\[)</string>
                 <key>end</key>
-                <string>(?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))</string>
+                <string>(?=$|[;,=}]|(\s+(of|in)\s+))</string>
                 <key>patterns</key>
                 <array>
                   <dict>
                     <key>begin</key>
-                    <string>\G</string>
+                    <string>(?&lt;=\[)</string>
                     <key>end</key>
                     <string>\]</string>
                     <key>endCaptures</key>
@@ -2245,7 +2245,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;!:)((?=$)|(?=\{|;|//))</string>
+        <string>(?&lt;!:)((?=$)|(?=\{|;|//|\}))</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -3642,7 +3642,7 @@
                 <key>name</key>
                 <string>meta.object-literal.key.ts</string>
                 <key>begin</key>
-                <string>\G(?&lt;!:)</string>
+                <string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*:)</string>
                 <key>end</key>
                 <string>:</string>
                 <key>endCaptures</key>

TypeScriptReact.tmLanguage

@@ -192,14 +192,14 @@
               </dict>
               <dict>
                 <key>begin</key>
-                <string>\G</string>
+                <string>(?&lt;=\{)</string>
                 <key>end</key>
-                <string>(?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))</string>
+                <string>(?=$|[;,=}]|(\s+(of|in)\s+))</string>
                 <key>patterns</key>
                 <array>
                   <dict>
                     <key>begin</key>
-                    <string>\G</string>
+                    <string>(?&lt;=\{)</string>
                     <key>end</key>
                     <string>\}</string>
                     <key>endCaptures</key>
@@ -253,14 +253,14 @@
               </dict>
               <dict>
                 <key>begin</key>
-                <string>\G</string>
+                <string>(?&lt;=\[)</string>
                 <key>end</key>
-                <string>(?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))</string>
+                <string>(?=$|[;,=}]|(\s+(of|in)\s+))</string>
                 <key>patterns</key>
                 <array>
                   <dict>
                     <key>begin</key>
-                    <string>\G</string>
+                    <string>(?&lt;=\[)</string>
                     <key>end</key>
                     <string>\]</string>
                     <key>endCaptures</key>
@@ -2249,7 +2249,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;!:)((?=$)|(?=\{|;|//))</string>
+        <string>(?&lt;!:)((?=$)|(?=\{|;|//|\}))</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -3624,7 +3624,7 @@
                 <key>name</key>
                 <string>meta.object-literal.key.tsx</string>
                 <key>begin</key>
-                <string>\G(?&lt;!:)</string>
+                <string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*:)</string>
                 <key>end</key>
                 <string>:</string>
                 <key>endCaptures</key>