Merge branch 'master' of https://github.com/Microsoft/TypeScript-TmLanguage

Author: mtpc

TypeScript.YAML-tmLanguage

@@ -26,9 +26,10 @@ variables:
   lookBehindOf: '^of|{{nonPropertyLookBehind}}of'
   lookBehindTypeof: '^typeof|{{nonPropertyLookBehind}}typeof'
   lookBehindCase: '^case|{{nonPropertyLookBehind}}case'
-  matchingParenthesis: (\([^\(\)]*\))
-  matchingBraces: (\{[^\{\}]*\})
-  matchingBrackets: (\[[^\[\]]*\])
+  matchingParenthesis: (\(([^\(\)]|(\([^\(\)]*\)))*\))
+  matchingBraces: (\{([^\{\}]|(\{[^\{\}]*\}))*\})
+  matchingBrackets: (\[([^\[\]]|(\[[^\[\]]*\]))*\])
+  inlineComment: \/\*([^\*]|(\*[^\/]))*\*\/
   # Identifier start | matching braces | matching parenthesis | matching square brackets
   typeParamersStart: ([_$[:alpha:]]|{{matchingBraces}}|{{matchingParenthesis}}|{{matchingBrackets}})
   typeParameters: (<\s*{{typeParamersStart}}([^=<>]|=[^<]|\<\s*{{typeParamersStart}}([^=<>]|=[^<])*\>)*>\s*)
@@ -462,6 +463,7 @@ repository:
       '5': { name: meta.definition.function.ts entity.name.function.ts }
     end: (?=$|^|;)|(?<=\})
     patterns:
+    - include: '#function-name'
     - include: '#function-body'
 
   function-expression:
@@ -474,15 +476,22 @@ repository:
       '4': { name: meta.definition.function.ts entity.name.function.ts }
     end: (?<=\})
     patterns:
+    - include: '#function-name'
     - include: '#function-body'
 
+  function-name:
+    name: meta.definition.function.ts entity.name.function.ts
+    match: '{{identifier}}'
+
   function-body:
     patterns:
     - include: '#comment'
     - include: '#type-parameters'
     - include: '#function-parameters'
     - include: '#return-type'
     - include: '#decl-block'
+    - name: keyword.generator.asterisk.ts
+      match: \*
 
   method-declaration:
     patterns:
@@ -721,6 +730,7 @@ repository:
     - include: '#variable-initializer'
     - include: '#access-modifier'
     - include: '#property-accessor'
+    - include: '#async-modifier'
     - include: '#after-operator-block-as-object-literal'
     - include: '#decl-block'
     - include: '#expression'
@@ -735,6 +745,10 @@ repository:
     name: storage.type.property.ts
     match: '{{startOfIdentifier}}(get|set){{endOfIdentifier}}'
 
+  async-modifier:
+    name: storage.modifier.async.ts
+    match:  '{{startOfIdentifier}}(async){{endOfIdentifier}}'
+
   #enum
   enum-declaration:
     name: meta.enum.declaration.ts
@@ -951,18 +965,24 @@ repository:
       - include: '#statements'
 
   for-loop:
-    begin: '{{startOfIdentifier}}(for)(?:\s+(await))?\s*(\()'
+    begin: '{{startOfIdentifier}}for(?=((\s+|(\s*{{inlineComment}}\s*))await)?\s*({{inlineComment}}\s*)?(\())'
     beginCaptures:
-      '1': { name: keyword.control.loop.ts }
-      '2': { name: keyword.control.loop.ts }
-      '3': { name: meta.brace.round.ts }
-    end: \)
-    endCaptures:
-      '0': { name: meta.brace.round.ts }
+      '0': { name: keyword.control.loop.ts }
+    end: (?<=\))
     patterns:
-    - include: '#var-expr'
-    - include: '#expression'
-    - include: '#punctuation-semicolon'
+    - include: '#comment'
+    - name: keyword.control.loop.ts
+      match: await
+    - begin: \(
+      beginCaptures:
+        '0': { name: meta.brace.round.ts }
+      end: \)
+      endCaptures:
+        '0': { name: meta.brace.round.ts }
+      patterns:
+      - include: '#var-expr'
+      - include: '#expression'
+      - include: '#punctuation-semicolon'
 
   #blocks
   decl-block:
@@ -1005,14 +1025,19 @@ repository:
     - include: '#object-literal-method-declaration'
     - name: meta.object.member.ts meta.object-literal.key.ts
       begin: (?=\[)
-      end: (?=:)
+      end: (?=:)|((?<=[\]])(?=\s*[\(\<]))
       patterns:
       - include: '#array-literal'
     - name: meta.object.member.ts meta.object-literal.key.ts
       begin: (?=[\'\"])
-      end: (?=:)
+      end: (?=:)|((?<=[\'\"])(?=\s*[\(\<]))
       patterns:
       - include: '#string'
+    - name: meta.method.declaration.ts
+      begin: (?<=[\]\'\"])(?=\s*[\(\<])
+      end: (?=\}|;|,)|(?<=\})
+      patterns:
+      - include: '#function-body'
     - name: meta.object.member.ts
       match: (?![_$[:alpha:]])([[:digit:]]+)\s*(?=:)
       captures:
@@ -1154,6 +1179,14 @@ repository:
     patterns:
     - name: keyword.control.flow.ts
       match: '{{startOfIdentifier}}(await){{endOfIdentifier}}'
+    - begin: '{{startOfIdentifier}}(yield){{endOfIdentifier}}(?=\s*{{inlineComment}}\s*\*)'
+      beginCaptures:
+        '1': { name: keyword.control.flow.ts }
+      end: \*
+      endCaptures:
+        '0': { name: keyword.generator.asterisk.ts }
+      patterns:
+      - include: '#comment'
     - match: '{{startOfIdentifier}}(yield){{endOfIdentifier}}(?:\s*(\*))?'
       captures:
         '1': { name: keyword.control.flow.ts }