Merge pull request #405 from Alhadis/case-fix

Fix missing highlighting in case statements

Author: Wliu

Diff for: grammars/javascript.cson

@@ -275,12 +275,20 @@
     'name': 'meta.export.js'
   }
   {
-    'match': '(?<!\\.)\\b(super|this|arguments)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(super|this|arguments)(?=\\s*:)'
+    'match': '''(?x)
+      (?<!\\.)\\b(super|this|arguments)(?!\\s*:)\\b
+      |
+      (?<=\\?)\\s*(super|this|arguments)(?=\\s*:)
+      |
+      (?<=[\\s}:;]case|^case)\\s+(super|this|arguments)(?=\\s*:)
+    '''
     'captures':
       '1':
         'name': 'variable.language.js'
       '2':
         'name': 'variable.language.js'
+      '3':
+        'name': 'variable.language.js'
   }
   {
     # [async] function [name](params)
@@ -907,28 +915,52 @@
     'name': 'keyword.operator.spread.js'
   }
   {
-    'match': '(?<!\\.)\\b(true|false)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(true|false)(?=\\s*:)'
+    'match': '''(?x)
+      (?<!\\.)\\b(true|false)(?!\\s*:)\\b
+      |
+      (?<=\\?)\\s*(true|false)(?=\\s*:)
+      |
+      (?<=[\\s}:;]case|^case)\\s+(true|false)(?=\\s*:)
+    '''
     'captures':
       '1':
         'name': 'constant.language.boolean.$1.js'
       '2':
         'name': 'constant.language.boolean.$2.js'
+      '3':
+        'name': 'constant.language.boolean.$3.js'
   }
   {
-    'match': '(?<!\\.)\\b(null)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(null)(?=\\s*:)'
+    'match': '''(?x)
+      (?<!\\.)\\b(null)(?!\\s*:)\\b
+      |
+      (?<=\\?)\\s*(null)(?=\\s*:)
+      |
+      (?<=[\\s}:;]case|^case)\\s+(null)(?=\\s*:)
+    '''
     'captures':
       '1':
         'name': 'constant.language.null.js'
       '2':
         'name': 'constant.language.null.js'
+      '3':
+        'name': 'constant.language.null.js'
   }
   {
-    'match': '(?<!\\.)\\b(debugger)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(debugger)(?=\\s*:)'
+    'match': '''(?x)
+      (?<!\\.)\\b(debugger)(?!\\s*:)\\b
+      |
+      (?<=\\?)\\s*(debugger)(?=\\s*:)
+      |
+      (?<=[\\s}:;]case|^case)\\s+(debugger)(?=\\s*:)
+    '''
     'captures':
       '1':
         'name': 'keyword.other.js'
       '2':
         'name': 'keyword.other.js'
+      '3':
+        'name': 'keyword.other.js'
   }
   {
     'match': '(?<!\\$)\\b(Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Map|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|performance|Radio|RegExp|Reset|Select|Set|String|Style|Submit|Symbol|screen|sun|Text|Textarea|WeakMap|WeakSet|window|XMLHttpRequest)\\b'
@@ -955,12 +987,20 @@
     'name': 'support.constant.dom.js'
   }
   {
-    'match': '(?<!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(module|exports|__filename|__dirname|global|process)(?=\\s*:)'
+    'match': '''(?x)
+      (?<!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b
+      |
+      (?<=\\?)\\s*(module|exports|__filename|__dirname|global|process)(?=\\s*:)
+      |
+      (?<=[\\s}:;]case|^case)\\s+(module|exports|__filename|__dirname|global|process)(?=\\s*:)
+    '''
     'captures':
       '1':
         'name': 'support.variable.js'
       '2':
         'name': 'support.variable.js'
+      '3':
+        'name': 'support.variable.js'
   }
   {
     'match': '\\b(Infinity|NaN|undefined)\\b'

Diff for: spec/javascript-spec.coffee

@@ -86,6 +86,12 @@ describe "Javascript grammar", ->
           expect(tokens[4]).toEqual value: ' ', scopes: ['source.js']
           expect(tokens[5]).toEqual value: keyword, scopes: ['source.js', scope]
 
+        it "tokenises `#{keyword}` in case statements", ->
+          {tokens} = grammar.tokenizeLine("case #{keyword}:")
+          expect(tokens[0]).toEqual value: 'case', scopes: ['source.js', 'keyword.control.js']
+          expect(tokens[2]).toEqual value: keyword, scopes: ['source.js', scope]
+          expect(tokens[3]).toEqual value: ':', scopes: ['source.js', 'keyword.operator.js']
+
   describe "built-in globals", ->
     it "tokenizes built-in classes", ->
       {tokens} = grammar.tokenizeLine('window')