Destructuring variable declaration

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -34,6 +34,7 @@ repository:
       '2': { name: storage.type.ts }
     end: (?=$|;)
     patterns:
+    - include: '#destructuring-variable'
     - include: '#var-single-variable'
     - include: '#comment'
 
@@ -52,6 +53,93 @@ repository:
       - include: '#string'
       - include: '#comment'
 
+  destructuring-variable:
+    patterns:
+    - name: meta.object-binding-pattern-variable.ts
+      begin: (?<!=|:)\s*(\{)
+      beginCaptures:
+        '1': { name: punctuation.definition.binding-pattern.object.ts }
+      end: (?=$|[;,])
+      patterns:
+      - include: '#variable-initializer'
+      - begin: \G
+        end: (?!\G)(?=$|[;,=])
+        patterns:
+        - begin: \G
+          end: \}
+          endCaptures:
+            '0': { name: punctuation.definition.binding-pattern.object.ts }
+          patterns:
+          - include: '#object-binding-element'
+        - include: '#type-annotation'
+        - include: '#comment'
+    - name: meta.array-binding-pattern-variable.ts
+      begin: (?<!=|:)\s*(\[)
+      beginCaptures:
+        '1': { name: punctuation.definition.binding-pattern.array.ts }
+      end: (?=$|[;,])
+      patterns:
+      - include: '#variable-initializer'
+      - begin: \G
+        end: (?!\G)(?=$|[;,=])
+        patterns:
+        - begin: \G
+          end: \]
+          endCaptures:
+            '0': { name: punctuation.definition.binding-pattern.array.ts }
+          patterns:
+          - include: '#array-binding-element'
+        - include: '#type-annotation'
+        - include: '#comment'
+
+  object-binding-element:
+    patterns:
+    - include: '#comment'
+    - begin: \b([a-zA-Z_$][\w$]*)\s*(:)
+      beginCaptures:
+        '1': { name: variable.object.property.ts }
+        '2': { name: punctuation.destructuring.ts }
+      end: (?=,|\})
+      patterns:
+      - include: '#object-binding-pattern'
+      - include: '#array-binding-pattern'
+      - name: variable.other.readwrite.ts
+        match: \b([a-zA-Z_$][\w$]*)\b
+    - name: variable.other.readwrite.ts
+      match: \b([a-zA-Z_$][\w$]*)\b
+    - name: meta.delimiter.object.comma.ts
+      match: ','
+
+  array-binding-element:
+    patterns:
+    - include: '#comment'
+    - include: '#object-binding-pattern'
+    - include: '#array-binding-pattern'
+    - name: variable.other.readwrite.ts
+      match: \b([a-zA-Z_$][\w$]*)\b
+    - name: meta.delimiter.object.comma.ts
+      match: ','
+
+  object-binding-pattern:
+    begin: \{
+    beginCaptures:
+      '0': { name: punctuation.definition.binding-pattern.object.ts }
+    end: \}
+    endCaptures:
+      '0': { name: punctuation.definition.binding-pattern.object.ts }
+    patterns:
+    - include: '#object-binding-element'
+
+  array-binding-pattern:
+    begin: \[
+    beginCaptures:
+      '0': { name: punctuation.definition.binding-pattern.array.ts }
+    end: \]
+    endCaptures:
+      '0': { name: punctuation.definition.binding-pattern.array.ts }
+    patterns:
+    - include: '#array-binding-element'
+
   ternary-expression:
     begin: (?=\?)
     end: (?=$|[;,}])
@@ -575,7 +663,7 @@ repository:
 
   type-operator:
     name: keyword.operator.type.ts
-    match: '[.|]'
+    match: '[&|]'
 
   type-function-return-type:
     name: meta.type.function.return.ts