Merge pull request #291 from MaximSokolov/tokenize-spread-operator

Tokenize spread operator

Author: Wliu

grammars/javascript.cson

@@ -694,7 +694,7 @@
       }
       {
         'match': '\\.\\.\\.'
-        'name': 'keyword.operator.js'
+        'name': 'keyword.operator.spread.js'
       }
       {
         'match': ','
@@ -742,6 +742,10 @@
     'match': '(?<!\\.)\\b(delete|in|of|instanceof|new|typeof|void)(?!\\s*:)\\b'
     'name': 'keyword.operator.$1.js'
   }
+  {
+    'match': '\\.\\.\\.'
+    'name': 'keyword.operator.spread.js'
+  }
   {
     'match': '(?<!\\.)\\b(true|false)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(true|false)(?=\\s*:)'
     'captures':

spec/javascript-spec.coffee

@@ -243,6 +243,15 @@ describe "Javascript grammar", ->
           expect(tokens[1]).toEqual value: operator, scopes: ['source.js', 'keyword.operator.logical.js']
           expect(tokens[2]).toEqual value: ' b', scopes: ['source.js']
 
+      it "tokenizes spread operator", ->
+        {tokens} = grammar.tokenizeLine('myFunction(...args);')
+        expect(tokens[2]).toEqual value: '...', scopes: ['source.js', 'meta.function-call.js', 'keyword.operator.spread.js']
+        expect(tokens[3]).toEqual value: 'args', scopes: ['source.js', 'meta.function-call.js']
+
+        {tokens} = grammar.tokenizeLine('[...iterableObj]')
+        expect(tokens[1]).toEqual value: '...', scopes: ['source.js', 'keyword.operator.spread.js']
+        expect(tokens[2]).toEqual value: 'iterableObj', scopes: ['source.js']
+
     describe "comparison", ->
       operators = ["<=", ">=", "!=", "!==", "===", "==", "<", ">" ]
 
@@ -380,7 +389,7 @@ describe "Javascript grammar", ->
       expect(tokens[6]).toEqual value: ',', scopes: ['source.js', 'meta.delimiter.object.comma.js']
       expect(tokens[7]).toEqual value: 'second', scopes: ['source.js', 'constant.other.js']
       expect(tokens[8]).toEqual value: ',', scopes: ['source.js', 'meta.delimiter.object.comma.js']
-      expect(tokens[9]).toEqual value: '...', scopes: ['source.js', 'keyword.operator.js']
+      expect(tokens[9]).toEqual value: '...', scopes: ['source.js', 'keyword.operator.spread.js']
       expect(tokens[10]).toEqual value: 'rest', scopes: ['source.js', 'constant.other.js']
       expect(tokens[11]).toEqual value: '}', scopes: ['source.js', 'meta.brace.curly.js']
       expect(tokens[12]).toEqual value: ' ', scopes: ['source.js']