Handle '|' and '&' operator in function return type when they are followed by object type

Fixes #427

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -836,12 +836,12 @@ 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
     - name: meta.object.type.ts
-      begin: (?<=:)\s*(\{)
+      begin: (?<=[:|&])\s*(\{)
       beginCaptures:
         '1': { name: punctuation.definition.block.ts }
       end: \}
@@ -970,12 +970,12 @@ repository:
     begin: '=>'
     beginCaptures:
       '0': { name: storage.type.function.arrow.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
     - name: meta.object.type.ts
-      begin: (?<==>)\s*(\{)
+      begin: (?:(?<==>)|(?<=[|&]))\s*(\{)
       beginCaptures:
         '1': { name: punctuation.definition.block.ts }
       end: \}
@@ -1663,7 +1663,7 @@ repository:
     # TODO: handle the fn and constructor type specifically.
     # Handle returning of object type specifically here so as to not confuse it with the start of function block
     - name: meta.object.type.ts
-      begin: (?<=:)\s*(\{)
+      begin: (?<=[:|&])\s*(\{)
       beginCaptures:
         '1': { name: punctuation.definition.block.ts }
       end: \}

TypeScript.tmLanguage

@@ -2581,7 +2581,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;!:)((?=$)|(?=[{};,]|//))</string>
+        <string>(?&lt;![:|&amp;])((?=$)|(?=[{};,]|//))</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2592,7 +2592,7 @@
             <key>name</key>
             <string>meta.object.type.ts</string>
             <key>begin</key>
-            <string>(?&lt;=:)\s*(\{)</string>
+            <string>(?&lt;=[:|&amp;])\s*(\{)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
@@ -2936,7 +2936,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;!=&gt;)(?=[,\]\)\{\}=;&gt;]|//|$)</string>
+        <string>(?&lt;!=&gt;)(?&lt;![|&amp;])(?=[,\]\)\{\}=;&gt;]|//|$)</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2947,7 +2947,7 @@
             <key>name</key>
             <string>meta.object.type.ts</string>
             <key>begin</key>
-            <string>(?&lt;==&gt;)\s*(\{)</string>
+            <string>(?:(?&lt;==&gt;)|(?&lt;=[|&amp;]))\s*(\{)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
@@ -4549,7 +4549,7 @@
             <key>name</key>
             <string>meta.object.type.ts</string>
             <key>begin</key>
-            <string>(?&lt;=:)\s*(\{)</string>
+            <string>(?&lt;=[:|&amp;])\s*(\{)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>

TypeScriptReact.tmLanguage

@@ -2585,7 +2585,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;!:)((?=$)|(?=[{};,]|//))</string>
+        <string>(?&lt;![:|&amp;])((?=$)|(?=[{};,]|//))</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2596,7 +2596,7 @@
             <key>name</key>
             <string>meta.object.type.tsx</string>
             <key>begin</key>
-            <string>(?&lt;=:)\s*(\{)</string>
+            <string>(?&lt;=[:|&amp;])\s*(\{)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
@@ -2940,7 +2940,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;!=&gt;)(?=[,\]\)\{\}=;&gt;]|//|$)</string>
+        <string>(?&lt;!=&gt;)(?&lt;![|&amp;])(?=[,\]\)\{\}=;&gt;]|//|$)</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -2951,7 +2951,7 @@
             <key>name</key>
             <string>meta.object.type.tsx</string>
             <key>begin</key>
-            <string>(?&lt;==&gt;)\s*(\{)</string>
+            <string>(?:(?&lt;==&gt;)|(?&lt;=[|&amp;]))\s*(\{)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
@@ -4495,7 +4495,7 @@
             <key>name</key>
             <string>meta.object.type.tsx</string>
             <key>begin</key>
-            <string>(?&lt;=:)\s*(\{)</string>
+            <string>(?&lt;=[:|&amp;])\s*(\{)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>