Support Import equals and import declarations

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -117,8 +117,8 @@ repository:
      - include: '#class-or-interface-declaration'
      - include: '#type-declaration'
      - include: '#enum-declaration'
-     # Todo: to change this to import declaration
-     - include: '#import-operator'
+     - include: '#import-equals-declaration'
+     - include: '#import-declaration'
      # TODO: change this to actual declarations of export, import, namespace
      - include: '#storage-keyword'
 
@@ -146,6 +146,88 @@ repository:
       '3': { name: storage.type.enum.ts }
       '4': { name: entity.name.type.enum.ts }
 
+  import-equals-declaration: 
+    patterns:
+    - name: meta.import-equals.external.ts
+      begin: (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(require)\s*(\()
+      beginCaptures:
+        '1': { name: keyword.control.export.ts }
+        '2': { name: keyword.control.import.ts }
+        '3': { name: variable.other.readwrite.alias.ts }
+        '4': { name: keyword.operator.assignment.ts }
+        '5': { name: keyword.control.require.ts }
+        '6': { name: meta.brace.round.ts }
+      end: \)
+      endCaptures:
+        '0': { name: meta.brace.round.ts }
+      patterns:
+        - include: '#comment'
+        - include: '#string'
+    - name: meta.import-equals.internal.ts
+      begin: (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(?!require\b)
+      beginCaptures:
+        '1': { name: keyword.control.export.ts }
+        '2': { name: keyword.control.import.ts }
+        '3': { name: variable.other.readwrite.alias.ts }
+        '4': { name: keyword.operator.assignment.ts }
+      end: (?=;|$)
+      patterns:
+        - include: '#comment'
+        - match: \b([a-zA-Z_$][\w$]*)\s*(\.)
+          captures:
+            '1': { name: entity.name.module.ts }
+            '2': { name: punctuation.accessor.ts }
+        - name: variable.other.readwrite.ts
+          match: \b([a-zA-Z_$][\w$]*)\b
+
+  import-declaration:
+    name: meta.import.ts
+    begin: (?:(\bexport)\s+)?(?<!\.)\b(import)(?!\s*:)\b
+    beginCaptures:
+      '1': { name: keyword.control.export.ts }
+      '2': { name: keyword.control.import.ts }
+    end: (?=;|$)
+    patterns:
+    - include: '#comment'
+    - include: '#string'
+    - include: '#import-block'
+    - name: keyword.control.from.ts
+      match: \bfrom\b
+    - include: '#import-clause'
+
+  import-block:
+    name: meta.block.ts
+    begin: \{
+    beginCaptures:
+      '0': { name: punctuation.definition.block.ts }
+    end: \}
+    endCaptures:
+      '0': { name: punctuation.definition.block.ts }
+    patterns:
+    - include: '#import-clause'
+
+  import-clause:
+    patterns:
+    - include: '#comment'
+    - comment: (default|*|name) as alias
+      match: '(?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b 
+        as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)'
+      captures:
+        '1': { name: keyword.control.default.ts }
+        '2': { name: constant.language.import-all.ts }
+        '3': { name: variable.other.readwrite.ts }
+        '4': { name: keyword.control.as.ts }
+        '5': { name: invalid.illegal.ts }
+        '6': { name: variable.other.readwrite.alias.ts }
+    - name: meta.delimiter.object.comma.ts
+      match: ','
+    - name: constant.language.import-all.ts
+      match: \*
+    - name: keyword.control.default.ts
+      match: \b(default)\b
+    - name: variable.other.readwrite.alias.ts
+      match: \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b
+
   class-or-interface-declaration:
     name: meta.declaration.object.ts
     begin: '\b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(?:(class)|(interface))\b'
@@ -634,13 +716,6 @@ repository:
     name: storage.type.function.arrow.ts
     match: =>
 
-  import-operator:
-    patterns:
-    - name: keyword.control.import.ts
-      match: \bimport\b
-    - name: keyword.control.from.ts
-      match: \bfrom\b
-
   operators:
     patterns:
     - name: keyword.operator.assignment.compound.ts