Merge pull request #155 from zhengbli/issue150

Fix issue 150

Author: zhengbli

TypeScript.YAML-tmLanguage

@@ -117,10 +117,13 @@ repository:
 
   field-declaration:
     name: meta.field.declaration.ts
-    match: '(?<!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))'
-    captures:
+    begin: '(?<!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))'
+    beginCaptures:
       '1': { name: variable.ts }
       '2': { name: keyword.operator.ts }
+    end: '(?=\}|;|,|\n)|(?<=\})'
+    patterns:
+    - include: '#expression'
 
   method-declaration:
     name: meta.method.declaration.ts
@@ -130,11 +133,11 @@ repository:
       '2': { name: keyword.operator.ts }
       '3': { name: entity.name.function.ts }
       '4': { name: keyword.operator.ts }
-    end: '(?=\}|;|,)|(?<=\})'
+    end: '(?=\}|;|,|\n)|(?<=\})'
     patterns:
     - include: '#comment'
     - include: '#type-parameters'
-    - include: '#function-parameters'
+    - include: '#function-type-parameters'
     - include: '#type-annotation'
     - include: '#decl-block'
 
@@ -166,12 +169,20 @@ repository:
       '2': { name: entity.name.function.ts }
     end: (?=;|\})|(?<=\})
     patterns:
+    - include: '#function-overload-declaration'
     - include: '#comment'
     - include: '#type-parameters'
-    - include: '#function-parameters'
+    - include: '#function-type-parameters'
     - include: '#return-type'
     - include: '#decl-block'
 
+  function-overload-declaration:
+    name: meta.function.overload.ts
+    match: \b(function)\b(?:\s+([a-zA-Z_$][\w$]*))?\s*
+    captures:
+      '1': { name: storage.type.function.ts }
+      '2': { name: entity.name.function.ts }
+
   block:
     name: meta.block.ts
     begin: \{
@@ -195,34 +206,6 @@ repository:
     patterns:
     - include: '#expression'
 
-  function-parameters:
-    name: meta.function-parameters.ts
-    begin: \(
-    beginCaptures:
-      '0': { name: meta.brace.round.ts }
-    end: \)
-    endCaptures:
-      '0': { name: meta.brace.round.ts }
-    patterns:
-      - include: '#comment'
-      - include: '#parameter-name'
-      - include: '#type-annotation'
-      - include: '#variable-initializer'
-
-  function-type-parameters:
-    name: meta.function.type.ts
-    begin: (\()
-    beginCaptures:
-      '1': { name: meta.brace.round.ts }
-    end: (\))
-    endCaptures:
-      '1': { name: meta.brace.round.ts }
-    patterns:
-    - include: '#comment'
-    - include: '#parameter-name'
-    - include: '#type-annotation'
-    - include: '#variable-initializer'
-
   parameter-name:
     name: parameter.name.ts
     match: '(?:\s*\b(public|private)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)'
@@ -234,51 +217,91 @@ repository:
 
   return-type:
     name: meta.return.type.ts
-    begin: '(?<=\)):'
+    begin: '(?<=\))\s*:'
     end: (?=$)|(?=\{|;|//)
     patterns:
     - include: '#type'
 
   type-annotation:
     name: meta.type.annotation.ts
     begin: ":"
-    end: (?=$|[,);\}\[\]]|//)|(?==[^>])|(?<=\}|[a-zA-Z_$]|>)\s*(?=\{)
+    end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=\}|[a-zA-Z_$]|>)\s*(?=\{)
     patterns:
-      - include: '#type'
-      - include: '#comment'
+    - include: '#type'
+    - include: '#comment'
 
   type:
     name: meta.type.ts
     patterns:
-    - include: '#type-name'
+    - include: '#type-primitive'
     - include: '#type-parameters'
-    - include: '#type-union'
+    - include: '#type-tuple'
     - include: '#object-type'
-    - include: '#function-type-parameters'
+    - include: '#type-operator'
+    - include: '#paren-type-or-function-type-parameters'
     - include: '#function-type-return-type'
+    - include: '#type-name'
+
+  function-type-parameters:
+    name: meta.function.type.parameter.ts
+    begin: \(
+    beginCaptures:
+      '0': { name: meta.brace.round.ts }
+    end: \)
+    endCaptures:
+      '0': { name: meta.brace.round.ts }
+    patterns:
+    - include: '#comment'
+    - include: '#parameter-name'
+    - include: '#type-annotation'
+    - include: '#variable-initializer'
+
+  type-primitive:
+    name: storage.type.ts
+    match: '\b(string|number|boolean|symbol|any|void)\b'
+
+  # Parenthesis can contain either types and function parameters
+  # (number | string) or (param: number, param2: string)
+  # and it can be nested, for example
+  # (number | (param: number, param2: string) => void)
+  paren-type-or-function-type-parameters:
+    name: meta.type.paren.cover.ts
+    begin: '(?:\b(new)\b)?\s*\('
+    beginCaptures:
+      '1': { name: keyword.operator.ts }
+    end: '\)'
+    patterns:
+    - include: '#comment'
+    - include: '#type'
+    - include: '#function-type-parameters'
+    
+  type-operator:
+    name: keyword.operator.type.ts
+    match: '[.|]'
 
   function-type-return-type:
     name: meta.function.type.return.ts
     begin: '=>'
     beginCaptures:
       '0': { name: keyword.operator.ts }
-    end: (?=[,\)\{=;]|//)
+    end: (?=[,\)\{=;]|//|$)
     patterns:
     - include: '#type'
 
-  type-union:
-    name: meta.type.union.ts
-    begin: '(\|)'
+  type-tuple:
+    name: meta.type.tuple.ts
+    begin: \[
     beginCaptures:
-      '1': { name: keyword.operator.ts }
-    end: '([a-zA-Z_$][.\w$]*)'
+      '0': { name: meta.brace.square.ts }
+    end: \]
     endCaptures:
-      '1': { name: storage.type.ts }
+      '0': { name: meta.brace.square.ts }
     patterns:
+    - include: '#type'
     - include: '#comment'
 
   type-name:
-    name: storage.type.ts
+    name: entity.name.type.ts
     match: '[a-zA-Z_$][.\w$]*'
 
   type-parameters:
@@ -332,18 +355,32 @@ repository:
     captures:
       '1': { name: storage.type.ts }
       '3': { name: keyword.operator.ts }
+      
   cast:
     name: cast.expr.ts
-    match: '<\s*([a-zA-Z_$][.\w$]*)\s*(?:<([a-zA-Z_$][.\w$]*)>)?\s*(\[\])*\s*>'
-    captures:
-       '1': { name: storage.type.ts }
-       '2': { name: storage.type.ts }
+    # To differentiate a cast vs a relational <, this regexp tries to use the surrounding context
+    # If < is preceeded by 'return', 'throw', 'yield' its most likely a type assertion
+    # An '=', '(', ',', ':', or '>' character followed by '<' is likely a type assertion, as otherwise its a syntax error
+    # '<=' and '<<=' are definately not type assertions, as they are assignment operators.
+    begin: '(?:(?<=return|throw|yield|[=(,:>]))\s*(<)(?!<?\=)'
+    beginCaptures:
+      '1': { name: keyword.operator.type.ts }
+    end: '>'
+    endCaptures:
+      '0': { name: keyword.operator.type.ts }
+    patterns:
+    - include: '#type'
+
   new-expr:
     name: new.expr.ts
-    match: '\b(new)\b\s*([a-zA-Z_$][.\w$]*)'
-    captures:
-       '1': { name: keyword.operator.ts }
-       '2': { name: storage.type.ts }
+    begin: '\b(new)\b'
+    beginCaptures:
+      '1': { name: keyword.operator.ts }
+    # new-expr ends just before any type or call arguments. Type arguments will be picked up by #cast.
+    end: '(?=[<(;]|$)'
+    patterns:
+    - include: '#type'
+
   object-member:
     name: meta.object.member.ts
     begin: '[a-zA-Z_$][\w$]*\s*:'
@@ -356,19 +393,19 @@ repository:
     match: =>|\b(delete|export|import|in|instanceof|module|new|typeof|void)\b
 
   arithmetic-operator:
-    name: keyword.operator.ts
+    name: keyword.operator.arithmetic.ts
     match: \*|/|\-\-|\-|\+\+|\+|%
 
   relational-operator:
-    name: keyword.operator.ts
+    name: keyword.operator.comparison.ts
     match: ===|==|=|!=|!==|<=|>=|<>|<|>
 
   assignment-operator:
-    name: keyword.operator.ts
+    name: keyword.operator.assignment.ts
     match: <<=|>>=|>>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=
 
   logic-operator:
-    name: keyword.operator.ts
+    name: keyword.operator.arithmetic.ts
     match: \!|&|~|\||&&|\|\|
 
   storage-keyword: