Merge pull request #378 from Microsoft/castAndObjectTypeFixes

Cast and object type fixes

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -308,8 +308,7 @@ repository:
     - include: '#string'
     - name: entity.name.type.module.ts
       match: ([_$[:alpha:]][_$[:alnum:]]*)
-    - name: punctuation.accessor.ts
-      match: \.      
+    - include: '#punctuation-accessor'      
 
   import-equals-declaration: 
     patterns:
@@ -511,6 +510,7 @@ repository:
       - include: '#type'
     - include: '#punctuation-comma'
     - include: '#punctuation-semicolon'
+    - include: '#type'
 
   field-declaration:
     name: meta.field.declaration.ts
@@ -1368,8 +1368,7 @@ repository:
     end: (?<=\))(?!(\.\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(<([^<>]|\<[^<>]+\>)+>\s*)?\()
     patterns:
     - include: '#support-objects'
-    - name: punctuation.accessor.ts
-      match: \.
+    - include: '#punctuation-accessor'
     - name: entity.name.function.ts
       match: ([_$[:alpha:]][_$[:alnum:]]*)
     - include: '#comment'
@@ -1441,7 +1440,7 @@ repository:
     # If '<' is preceeded by 'return', 'throw', 'yield', or 'await', it's most likely a type assertion
     # If '=', '(', ',', ':', or '>' are followed by a '<', it is also likely a type assertion as otherwise it would be a syntax error
     # '<=' and '<<=' are cannot be type assertions, as they are assignment operators.
-    begin: (?:(?<=return|throw|yield|await|default|[=(,:>*]))\s*(<)(?!<?\=)
+    begin: (?:(?<=return|throw|yield|await|default|^|[=(,:>*]))\s*(<)(?!<?\=)
     beginCaptures:
       '1': { name: meta.brace.angle.ts }
     end: \>

TypeScript.tmLanguage

@@ -941,10 +941,8 @@
             <string>([_$[:alpha:]][_$[:alnum:]]*)</string>
           </dict>
           <dict>
-            <key>name</key>
-            <string>punctuation.accessor.ts</string>
-            <key>match</key>
-            <string>\.</string>
+            <key>include</key>
+            <string>#punctuation-accessor</string>
           </dict>
         </array>
       </dict>
@@ -1634,6 +1632,10 @@
             <key>include</key>
             <string>#punctuation-semicolon</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#type</string>
+          </dict>
         </array>
       </dict>
       <key>field-declaration</key>
@@ -3786,10 +3788,8 @@
             <string>#support-objects</string>
           </dict>
           <dict>
-            <key>name</key>
-            <string>punctuation.accessor.ts</string>
-            <key>match</key>
-            <string>\.</string>
+            <key>include</key>
+            <string>#punctuation-accessor</string>
           </dict>
           <dict>
             <key>name</key>
@@ -3970,7 +3970,7 @@
         <key>name</key>
         <string>cast.expr.ts</string>
         <key>begin</key>
-        <string>(?:(?&lt;=return|throw|yield|await|default|[=(,:&gt;*]))\s*(&lt;)(?!&lt;?\=)</string>
+        <string>(?:(?&lt;=return|throw|yield|await|default|^|[=(,:&gt;*]))\s*(&lt;)(?!&lt;?\=)</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>

TypeScriptReact.tmLanguage

@@ -945,10 +945,8 @@
             <string>([_$[:alpha:]][_$[:alnum:]]*)</string>
           </dict>
           <dict>
-            <key>name</key>
-            <string>punctuation.accessor.tsx</string>
-            <key>match</key>
-            <string>\.</string>
+            <key>include</key>
+            <string>#punctuation-accessor</string>
           </dict>
         </array>
       </dict>
@@ -1638,6 +1636,10 @@
             <key>include</key>
             <string>#punctuation-semicolon</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#type</string>
+          </dict>
         </array>
       </dict>
       <key>field-declaration</key>
@@ -3790,10 +3792,8 @@
             <string>#support-objects</string>
           </dict>
           <dict>
-            <key>name</key>
-            <string>punctuation.accessor.tsx</string>
-            <key>match</key>
-            <string>\.</string>
+            <key>include</key>
+            <string>#punctuation-accessor</string>
           </dict>
           <dict>
             <key>name</key>