Fix the identifier pattern

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -40,7 +40,7 @@ repository:
 
   var-single-variable:
     name: meta.var-single-variable.expr.ts
-    begin: \b([a-zA-Z_$][\w$]*)\b
+    begin: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     beginCaptures:
       '1': { name: variable.other.readwrite.ts }
     end: (?=$|[;,])
@@ -95,7 +95,7 @@ repository:
   object-binding-element:
     patterns:
     - include: '#comment'
-    - begin: \b([a-zA-Z_$][\w$]*)\s*(:)
+    - begin: \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:)
       beginCaptures:
         '1': { name: variable.object.property.ts }
         '2': { name: punctuation.destructuring.ts }
@@ -104,9 +104,9 @@ repository:
       - include: '#object-binding-pattern'
       - include: '#array-binding-pattern'
       - name: variable.other.readwrite.ts
-        match: \b([a-zA-Z_$][\w$]*)\b
+        match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     - name: variable.other.readwrite.ts
-      match: \b([a-zA-Z_$][\w$]*)\b
+      match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     - name: meta.delimiter.object.comma.ts
       match: ','
 
@@ -116,7 +116,7 @@ repository:
     - include: '#object-binding-pattern'
     - include: '#array-binding-pattern'
     - name: variable.other.readwrite.ts
-      match: \b([a-zA-Z_$][\w$]*)\b
+      match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     - name: meta.delimiter.object.comma.ts
       match: ','
 
@@ -223,7 +223,7 @@ repository:
 
   type-declaration:
     name: meta.type.declaration.ts
-    begin: (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*
+    begin: (?:(\bexport)\s+)?\b(type)\b\s+([_$[:alpha:]][_$[:alnum:]]*)\s*
     beginCaptures:
       '1': { name: keyword.control.export.ts }
       '2': { name: storage.type.type.ts }
@@ -238,7 +238,7 @@ repository:
 
   enum-declaration:
     name: meta.enum.declaration.ts
-    match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*)
+    match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([_$[:alpha:]][_$[:alnum:]]*)
     captures:
       '1': { name: keyword.control.export.ts }
       '2': { name: storage.modifier.ts}
@@ -256,14 +256,14 @@ repository:
     - include: '#comment'
     - include: '#string'
     - name: entity.name.type.module.ts
-      match: \b([a-zA-Z_$][\w$]*)\b
+      match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     - name: punctuation.accessor.ts
       match: \.      
 
   import-equals-declaration: 
     patterns:
     - name: meta.import-equals.external.ts
-      begin: (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(require)\s*(\()
+      begin: (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(require)\s*(\()
       beginCaptures:
         '1': { name: keyword.control.export.ts }
         '2': { name: keyword.control.import.ts }
@@ -278,7 +278,7 @@ repository:
         - include: '#comment'
         - include: '#string'
     - name: meta.import-equals.internal.ts
-      begin: (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(?!require\b)
+      begin: (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(?!require\b)
       beginCaptures:
         '1': { name: keyword.control.export.ts }
         '2': { name: keyword.control.import.ts }
@@ -287,12 +287,12 @@ repository:
       end: (?=;|$)
       patterns:
         - include: '#comment'
-        - match: \b([a-zA-Z_$][\w$]*)\s*(\.)
+        - match: \b([_$[:alpha:]][_$[:alnum:]]*)\s*(\.)
           captures:
             '1': { name: entity.name.type.module.ts }
             '2': { name: punctuation.accessor.ts }
         - name: variable.other.readwrite.ts
-          match: \b([a-zA-Z_$][\w$]*)\b
+          match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
 
   import-declaration:
     name: meta.import.ts
@@ -306,7 +306,7 @@ repository:
 
   export-declaration:
     patterns:
-    - match: \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([a-zA-Z_$][\w$]*)
+    - match: \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([_$[:alpha:]][_$[:alnum:]]*)
       captures:
         '1': { name: keyword.control.export.ts }
         '2': { name: keyword.control.as.ts }
@@ -353,8 +353,8 @@ repository:
     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)'
+      match: '(?x) (?: \b(default)\b | (\*) | \b([_$[:alpha:]][_$[:alnum:]]*)\b) \s* (\b 
+        as \b) \s* (?: (\b default \b | \*) | \b([_$[:alpha:]][_$[:alnum:]]*)\b)'
       captures:
         '1': { name: keyword.control.default.ts }
         '2': { name: constant.language.import-export-all.ts }
@@ -369,7 +369,7 @@ repository:
     - 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
+      match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
 
   class-or-interface-declaration:
     name: meta.declaration.object.ts
@@ -391,7 +391,7 @@ repository:
 
   class-or-interface-name:
     name: meta.object.name.ts
-    match: '[a-zA-Z_$][\w$]*'
+    match: '[_$[:alpha:]][_$[:alnum:]]*'
     captures:
       '0': { name: 'entity.name.class.ts' }
 
@@ -411,7 +411,7 @@ repository:
 
   class-or-interface-heritage-type:
     name: meta.object.heritage.parent.ts
-    match: '(?:\b([a-zA-Z_$][\w$]*)\b)'
+    match: '(?:\b([_$[:alpha:]][_$[:alnum:]]*)\b)'
     captures:
       '1': { name: entity.other.inherited-class.ts }
 
@@ -457,7 +457,7 @@ repository:
 
   field-declaration:
     name: meta.field.declaration.ts
-    begin: (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))
+    begin: (?<!\()\s*((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))
     beginCaptures:
       '1': { name: variable.object.property.ts }
       '2': { name: keyword.operator.optional.ts }
@@ -469,7 +469,7 @@ repository:
 
   method-declaration:
     name: meta.method.declaration.ts
-    begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<])
+    begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<])
     beginCaptures:
       '1': { name: storage.modifier.ts } # captures keyword (abstract)
       '2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
@@ -487,7 +487,7 @@ repository:
 
   method-overload-declaration:
     name: meta.method.overload.declaration.ts
-    begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<])
+    begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<])
     beginCaptures:
       '1': { name: storage.modifier.ts } # captures keyword (abstract)
       '2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
@@ -508,7 +508,7 @@ repository:
     - name: storage.type.ts
       match: \bconstructor\b(?=\s*[\(\<])
     - name: entity.name.function.ts
-      match: \b[a-zA-Z_$][\.\w$]*
+      match: \b[_$[:alpha:]][_$[:alnum:]]*
     - name: keyword.operator.optional.ts
       match: \?
 
@@ -527,13 +527,13 @@ repository:
 
   indexer-parameter:
     name: meta.indexer.parameter.ts
-    match: ([a-zA-Z_$][\w$]*)(?=\:)
+    match: ([_$[:alpha:]][_$[:alnum:]]*)(?=\:)
     captures:
       '1': { name: variable.parameter.ts}
 
   function-declaration:
     name: meta.function.ts
-    begin: \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*
+    begin: \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s*
     beginCaptures:
       '1': { name: keyword.control.export.ts }
       '2': { name: storage.modifier.async.ts }
@@ -550,7 +550,7 @@ repository:
 
   function-overload-declaration:
     name: meta.function.overload.ts
-    match: \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*
+    match: \b(?:(export)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s*
     captures:
       '1': { name: keyword.control.export.ts }
       '2': { name: storage.type.function.ts }
@@ -601,7 +601,7 @@ repository:
     - include: '#object-member' 
 
   parameter-name:
-    match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([a-zA-Z_$][\w$]*)\s*(\??)'
+    match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([_$[:alpha:]][_$[:alnum:]]*)\s*(\??)'
     captures:
       '1': { name: storage.modifier.ts }
       '2': { name: keyword.operator.spread.ts }
@@ -632,7 +632,7 @@ repository:
   parameter-object-binding-element:
     patterns:
     - include: '#comment'
-    - begin: \b([a-zA-Z_$][\w$]*)\s*(:)
+    - begin: \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:)
       beginCaptures:
         '1': { name: variable.object.property.ts }
         '2': { name: punctuation.destructuring.ts }
@@ -641,9 +641,9 @@ repository:
       - include: '#parameter-object-binding-pattern'
       - include: '#parameter-array-binding-pattern'
       - name: variable.parameter.ts
-        match: \b([a-zA-Z_$][\w$]*)\b
+        match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     - name: variable.parameter.ts
-      match: \b([a-zA-Z_$][\w$]*)\b
+      match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     - name: meta.delimiter.object.comma.ts
       match: ','
 
@@ -653,7 +653,7 @@ repository:
     - include: '#parameter-object-binding-pattern'
     - include: '#parameter-array-binding-pattern'
     - name: variable.parameter.ts
-      match: \b([a-zA-Z_$][\w$]*)\b
+      match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
     - name: meta.delimiter.object.comma.ts
       match: ','
 
@@ -697,7 +697,7 @@ repository:
   type-annotation:
     name: meta.type.annotation.ts
     begin: ":"
-    end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{)
+    end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[_$[:alpha:]])\s*(?=\{)
     patterns:
     - include: '#expression-operator'
     - include: '#type'
@@ -790,12 +790,17 @@ repository:
     - include: '#comment'
 
   type-name:
-    name: entity.name.type.ts
-    match: '[a-zA-Z_$][.\w$]*'
+    patterns:
+    - match: \b([_$[:alpha:]][_$[:alnum:]]*)\s*(\.)
+      captures:
+        '1': { name: entity.name.type.module.ts }
+        '2': { name: punctuation.accessor.ts }
+    - name: entity.name.type.ts
+      match: '[_$[:alpha:]][_$[:alnum:]]*'
 
   type-parameters:
     name: meta.type.parameters.ts
-    begin: '([a-zA-Z_$][\w$]*)?(<)'
+    begin: '([_$[:alpha:]][_$[:alnum:]]*)?(<)'
     beginCaptures:
       '1': { name: entity.name.type.ts }
       '2': { name: punctuation.definition.typeparameters.begin.ts }
@@ -871,7 +876,7 @@ repository:
 
   for-in-simple:
     name: forin.expr.ts
-    match: (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(?:(in)|(of))\b
+    match: (?<=\()\s*\b(var|let|const)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(?:(in)|(of))\b
     captures:
       '1': { name: storage.type.ts }
       '2': { name: variable.other.readwrite.ts }
@@ -915,7 +920,7 @@ repository:
     - include: '#comment'
     - include: '#method-declaration'
     - name: meta.object.member.ts
-      begin: '[a-zA-Z_$][\w$]*\s*:'
+      begin: '[_$[:alpha:]][_$[:alnum:]]*\s*:'
       end: (?=,|\})
       patterns:
       - include: '#expression'
@@ -1087,7 +1092,7 @@ repository:
 
   template:
     name: string.template.ts
-    begin: '(?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`)'
+    begin: '(?:\b([_$[:alpha:]][_$[:alnum:]]*)\b)?(`)'
     beginCaptures:
       '1': { name: entity.name.function.tagged-template.ts }
       '2': { name: punctuation.definition.string.template.begin.ts }
@@ -1142,7 +1147,7 @@ repository:
     patterns:
     - name: storage.type.class.jsdoc
       match: (?<!\w)@(abstract|access|alias|arg|argument|async|attribute|augments|author|beta|borrows|bubbes|callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright|default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exports?|extends|extension|extension_for|extensionfor|external|file|fileoverview|final|fires|for|function|global|host|ignore|implements|inherit[Dd]oc|inner|instance|interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixins?|module|name|namespace|nocollapse|nosideeffects|override|overview|package|param|preserve|private|prop|property|protected|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation|version|virtual|writeOnce)\b
-    - match: ({\b(?:[a-zA-Z_$][a-zA-Z_$0-9]*)\b})\s\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b\s*((?:(?!\*\/).)*)
+    - match: ({\b(?:[_$[:alpha:]][_$[:alnum:]]*)\b})\s\b([_$[:alpha:]][_$[:alnum:]]*)\b\s*((?:(?!\*\/).)*)
       captures:
         '0': {name: other.meta.jsdoc}
         '1': {name: entity.name.type.instance.jsdoc}