🐛 Tokenize '1.E3' as number

Author: MaximSokolov

grammars/javascript.cson

@@ -859,10 +859,10 @@
     'include': '#function_call'
   }
   {
-    'include': '#object_variable'
+    'include': '#numbers'
   }
   {
-    'include': '#numbers'
+    'include': '#object_variable'
   }
   {
     'include': '#properties'
@@ -937,12 +937,13 @@
         'match': '''(?x)
           (?<!\\$)(?:
             (?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b)| # 1.1E+3
+            (?:\\b[0-9]+(\\.)[eE][+-]?[0-9]+\\b)|       # 1.E+3
             (?:\\B(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|       # .1E+3
             (?:\\b[0-9]+[eE][+-]?[0-9]+\\b)|            # 1E+3
             (?:\\b[0-9]+(\\.)[0-9]+\\b)|                # 1.1
             (?:\\b[0-9]+(\\.)\\B)|                      # 1.
             (?:\\B(\\.)[0-9]+\\b)|                      # .1
-            (?:\\b[0-9]+\\b)                            # 1
+            (?:\\b[0-9]+\\b(?!\\.))                     # 1
           )(?!\\$)
         '''
         'captures':
@@ -958,6 +959,8 @@
             'name': 'meta.delimiter.decimal.period.js'
           '5':
             'name': 'meta.delimiter.decimal.period.js'
+          '6':
+            'name': 'meta.delimiter.decimal.period.js'
       }
     ]
   'operators':

spec/javascript-spec.coffee

@@ -228,6 +228,11 @@ describe "Javascript grammar", ->
       expect(tokens[0]).toEqual value: '.', scopes: ['source.js', 'constant.numeric.decimal.js', 'meta.delimiter.decimal.period.js']
       expect(tokens[1]).toEqual value: '1e-23', scopes: ['source.js', 'constant.numeric.decimal.js']
 
+      {tokens} = grammar.tokenizeLine('1.E3')
+      expect(tokens[0]).toEqual value: '1', scopes: ['source.js', 'constant.numeric.decimal.js']
+      expect(tokens[1]).toEqual value: '.', scopes: ['source.js', 'constant.numeric.decimal.js', 'meta.delimiter.decimal.period.js']
+      expect(tokens[2]).toEqual value: 'E3', scopes: ['source.js', 'constant.numeric.decimal.js']
+
     it "does not tokenize numbers that are part of a variable", ->
       {tokens} = grammar.tokenizeLine('hi$1')
       expect(tokens[0]).toEqual value: 'hi$1', scopes: ['source.js']