From 2486bce53549f80f506efd1938c56bc377b5c819 Mon Sep 17 00:00:00 2001
From: Maxim Sokolov <maxim0xff@gmail.com>
Date: Sun, 17 Apr 2016 11:49:51 +0300
Subject: [PATCH] Don't scope decimal mark to allow ligatures to work

---
 grammars/javascript.cson    | 35 +++++++++++------------------------
 spec/javascript-spec.coffee | 33 +++------------------------------
 2 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/grammars/javascript.cson b/grammars/javascript.cson
index 56a79e45..c73dcdd3 100644
--- a/grammars/javascript.cson
+++ b/grammars/javascript.cson
@@ -1052,32 +1052,19 @@
       }
       {
         '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
+          # Don't scope the decimal mark to allow ligatures to work
+          (?<!\\$)(
+            (\\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
           )(?!\\$)
         '''
-        'captures':
-          '0':
-            'name': 'constant.numeric.decimal.js'
-          '1':
-            'name': 'meta.delimiter.decimal.period.js'
-          '2':
-            'name': 'meta.delimiter.decimal.period.js'
-          '3':
-            'name': 'meta.delimiter.decimal.period.js'
-          '4':
-            'name': 'meta.delimiter.decimal.period.js'
-          '5':
-            'name': 'meta.delimiter.decimal.period.js'
-          '6':
-            'name': 'meta.delimiter.decimal.period.js'
+        'name': 'constant.numeric.decimal.js'
       }
     ]
   'operators':
diff --git a/spec/javascript-spec.coffee b/spec/javascript-spec.coffee
index 4a2fc17a..61dde35b 100644
--- a/spec/javascript-spec.coffee
+++ b/spec/javascript-spec.coffee
@@ -211,36 +211,9 @@ describe "Javascript grammar", ->
       expect(tokens[0]).toEqual value: '0010', scopes: ['source.js', 'constant.numeric.octal.js']
 
     it "tokenizes decimals", ->
-      {tokens} = grammar.tokenizeLine('1234')
-      expect(tokens[0]).toEqual value: '1234', scopes: ['source.js', 'constant.numeric.decimal.js']
-
-      {tokens} = grammar.tokenizeLine('5e-10')
-      expect(tokens[0]).toEqual value: '5e-10', scopes: ['source.js', 'constant.numeric.decimal.js']
-
-      {tokens} = grammar.tokenizeLine('5E+5')
-      expect(tokens[0]).toEqual value: '5E+5', scopes: ['source.js', 'constant.numeric.decimal.js']
-
-      {tokens} = grammar.tokenizeLine('9.')
-      expect(tokens[0]).toEqual value: '9', scopes: ['source.js', 'constant.numeric.decimal.js']
-      expect(tokens[1]).toEqual value: '.', scopes: ['source.js', 'constant.numeric.decimal.js', 'meta.delimiter.decimal.period.js']
-
-      {tokens} = grammar.tokenizeLine('.9')
-      expect(tokens[0]).toEqual value: '.', scopes: ['source.js', 'constant.numeric.decimal.js', 'meta.delimiter.decimal.period.js']
-      expect(tokens[1]).toEqual value: '9', scopes: ['source.js', 'constant.numeric.decimal.js']
-
-      {tokens} = grammar.tokenizeLine('9.9')
-      expect(tokens[0]).toEqual value: '9', 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: '9', scopes: ['source.js', 'constant.numeric.decimal.js']
-
-      {tokens} = grammar.tokenizeLine('.1e-23')
-      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']
+      for token in ['1234', '.9', '9.', '9.9', '5E+5', '5e-10', '.1e-23', '1.E+3', '1.E3', '1.1E+3']
+        {tokens} = grammar.tokenizeLine(token)
+        expect(tokens[0]).toEqual value: token, scopes: ['source.js', 'constant.numeric.decimal.js']
 
     it "does not tokenize numbers that are part of a variable", ->
       {tokens} = grammar.tokenizeLine('hi$1')