Support numeric literal in field/getter/setter/method declarations

Fixes #604

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -14,7 +14,23 @@ variables:
   constantIdentifier: '[[:upper:]][_$[:digit:][:upper:]]*'
   quotedStrings: (\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")
   nonIdentifierPropertyName: '{{quotedStrings}}|(\[([^\[\]]|\[[^\[\]]*\])+\])'
-  propertyName: (({{identifier}})|{{nonIdentifierPropertyName}})
+  hexNumber: \b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$)
+  binaryNumber: \b(?<!\$)0(b|B)[01][01_]*\b(?!\$)
+  octalNumber: \b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$)
+  decimalNumber: |-
+    (?<!\$)(?:
+      (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3
+      (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)|             # 1.E+3
+      (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)|             # .1E+3
+      (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)|                 # 1E+3
+      (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)|                      # 1.1
+      (?:\b[0-9][0-9_]*(\.)\B)|                                  # 1.
+      (?:\B(\.)[0-9][0-9_]*\b)|                                  # .1
+      (?:\b[0-9][0-9_]*\b(?!\.))                                 # 1
+    )(?!\$)
+  anyNumber: ({{hexNumber}})|({{binaryNumber}})|({{octalNumber}})|({{decimalNumber}})
+  # any use of property name needs to ignore line breaks in regular expression because of decimal number regex (maintained for readability)
+  propertyName: ({{anyNumber}}|({{identifier}})|{{nonIdentifierPropertyName}})
   constantVar: ({{constantIdentifier}})(?![_$[:alnum:]])
   endOfStatement: ';|\babstract\b|\basync\b|\bclass\b|\bconst\b|\bdeclare\b|\benum\b|\bexport\b|\bfunction\b|\bimport\b|\binterface\b|\blet\b|\bmodule\b|\bnamespace\b|\breturn\b|\btype\b|\bvar\b'
   nonPropertyLookBehind: '[^\._$[:alnum:]]'
@@ -269,7 +285,7 @@ repository:
   object-binding-element:
     patterns:
     - include: '#comment'
-    - begin: (?={{propertyName}}\s*(:))
+    - begin: (?x)(?={{propertyName}}\s*(:))
       end: (?=,|\})
       patterns:
       - include: '#object-binding-element-propertyName'
@@ -280,13 +296,14 @@ repository:
     - include: '#punctuation-comma'
 
   object-binding-element-propertyName:
-    begin: (?={{propertyName}}\s*(:))
+    begin: (?x)(?={{propertyName}}\s*(:))
     end: (:)
     endCaptures:
       '0': { name: punctuation.destructuring.ts }
     patterns:
     - include: '#string'
     - include: '#array-literal'
+    - include: '#numeric-literal'
     - name: variable.object.property.ts
       match: ({{identifier}})
 
@@ -374,7 +391,7 @@ repository:
   parameter-object-binding-element:
     patterns:
     - include: '#comment'
-    - begin: (?={{propertyName}}\s*(:))
+    - begin: (?x)(?={{propertyName}}\s*(:))
       end: (?=,|\})
       patterns:
       - include: '#object-binding-element-propertyName'
@@ -423,18 +440,19 @@ repository:
 
   field-declaration:
     name: meta.field.declaration.ts
-    begin: (?<!\()(?:{{startOfIdentifier}}(readonly)\s+)?(?={{propertyName}}\s*(\?\s*)?(=|:))
+    begin: (?x)(?<!\()(?:{{startOfIdentifier}}(readonly)\s+)?(?={{propertyName}}\s*(\?\s*)?(=|:))
     beginCaptures:
       '1': { name: storage.modifier.ts }
-    end: (?=\}|;|,|$|(^(?!{{propertyName}}\s*(\?\s*)?(=|:))))|(?<=\})
+    end: (?x)(?=\}|;|,|$|(^(?!{{propertyName}}\s*(\?\s*)?(=|:))))|(?<=\})
     patterns:
     - include: '#variable-initializer'
-    - begin: (?={{propertyName}}\s*(\?\s*)?(=|:))
-      end: (?=[};,=]|$|(^(?!{{propertyName}}\s*(\?\s*)?(=|:))))|(?<=\})
+    - begin: (?x)(?={{propertyName}}\s*(\?\s*)?(=|:))
+      end: (?x)(?=[};,=]|$|(^(?!{{propertyName}}\s*(\?\s*)?(=|:))))|(?<=\})
       patterns:
       - include: '#type-annotation'
       - include: '#string'
       - include: '#array-literal'
+      - include: '#numeric-literal'
       - include: '#comment'
       # function assignment |
       # typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>
@@ -511,7 +529,7 @@ repository:
     patterns:
     # method, accessor
     - name: meta.method.declaration.ts
-      begin: '{{startOfIdentifier}}(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))\s*[\(\<])'
+      begin: '(?x){{startOfIdentifier}}(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))\s*[\(\<])'
       beginCaptures:
         '1': { name: storage.modifier.ts } # captures keyword (public or private or protected)
         '2': { name: storage.modifier.ts } # captures keyword (abstract)
@@ -524,7 +542,7 @@ repository:
       - include: '#function-body'
     # new, constructor or call signature
     - name: meta.method.declaration.ts
-      begin: '{{startOfIdentifier}}(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!:){{endOfIdentifier}})|(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))?\s*[\(\<]))'
+      begin: '(?x){{startOfIdentifier}}(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!:){{endOfIdentifier}})|(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))?\s*[\(\<]))'
       beginCaptures:
         '1': { name: storage.modifier.ts } # captures keyword (public or private or protected)
         '2': { name: storage.modifier.ts } # captures keyword (abstract)
@@ -539,7 +557,7 @@ repository:
 
   object-literal-method-declaration:
     name: meta.method.declaration.ts
-    begin: '{{startOfIdentifier}}(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))\s*[\(\<])'
+    begin: '(?x){{startOfIdentifier}}(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))\s*[\(\<])'
     beginCaptures:
       '1': { name: storage.modifier.async.ts } # captures keyword (async)
       '2': { name: storage.type.property.ts } # captures keyword (get|set)
@@ -548,7 +566,7 @@ repository:
     patterns:
     - include: '#method-declaration-name'
     - include: '#function-body'
-    - begin: '{{startOfIdentifier}}(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))\s*[\(\<])'
+    - begin: '(?x){{startOfIdentifier}}(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=({{propertyName}}\s*(\??))\s*[\(\<])'
       beginCaptures:
         '1': { name: storage.modifier.async.ts } # captures keyword (async)
         '2': { name: storage.type.property.ts } # captures keyword (get|set)
@@ -558,11 +576,12 @@ repository:
       - include: '#method-declaration-name'
 
   method-declaration-name:
-    begin: (?={{propertyName}}\s*(\??)\s*[\(\<])
+    begin: (?x)(?={{propertyName}}\s*(\??)\s*[\(\<])
     end: (?=\(|\<)
     patterns:
     - include: '#string'
     - include: '#array-literal'
+    - include: '#numeric-literal'
     - name: meta.definition.method.ts entity.name.function.ts
       match: '{{identifier}}'
     - name: keyword.operator.optional.ts
@@ -1390,23 +1409,14 @@ repository:
   numeric-literal:
     patterns:
     - name: constant.numeric.hex.ts
-      match: \b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$)
+      match: '{{hexNumber}}'
     - name: constant.numeric.binary.ts
-      match: \b(?<!\$)0(b|B)[01][01_]*\b(?!\$)
+      match: '{{binaryNumber}}'
     - name: constant.numeric.octal.ts
-      match: \b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$)
+      match: '{{octalNumber}}'
     - match: |-
         (?x)
-        (?<!\$)(?:
-          (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3
-          (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)|             # 1.E+3
-          (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)|             # .1E+3
-          (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)|                 # 1E+3
-          (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)|                      # 1.1
-          (?:\b[0-9][0-9_]*(\.)\B)|                                  # 1.
-          (?:\B(\.)[0-9][0-9_]*\b)|                                  # .1
-          (?:\b[0-9][0-9_]*\b(?!\.))                                 # 1
-        )(?!\$)
+        {{decimalNumber}}
       captures:
         '0': {name: constant.numeric.decimal.ts}
         '1': {name: meta.delimiter.decimal.period.ts}