Tokenize console, Math methods after comments

Author: MaximSokolov

grammars/javascript.cson

@@ -708,13 +708,16 @@
         'name': 'entity.name.type.object.console.js'
     'end': '''(?x)
       (?<=\\)) | (?=
-        (?! \\s*(\\.)\\s*
+        (?! (\\s*//)|(\\s*/\\*)|(\\s*(\\.)\\s*
           (assert|clear|debug|error|info|log|profile|profileEnd|time|timeEnd|warn)
           \\s*\\(
-        ) \\s*\\S
+        )) \\s*\\S
       )
     '''
     'patterns': [
+      {
+        'include': '#comments'
+      }
       {
         'begin': '\\s*(\\.)\\s*(\\w+)\\s*(?=\\()'
         'beginCaptures':
@@ -741,15 +744,18 @@
     'end': '''(?x)
       (?<=E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2|\\)
       ) | (?=
-        (?! \\s*\\.\\s* (
+        (?! (\\s*//)|(\\s*/\\*)|(\\s*\\.\\s* (
           ((abs|acos|acosh|asin|asinh|atan|atan2|atanh|cbrt|ceil|clz32|cos|cosh|exp|
           expm1|floor|fround|hypot|imul|log|log10|log1p|log2|max|min|pow|random|
           round|sign|sin|sinh|sqrt|tan|tanh|trunc)\\s*\\(
           ) | (E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2)(?!\\s*[\\w$(]))
-        ) \\s*\\S
+        )) \\s*\\S
       )
     '''
     'patterns': [
+      {
+        'include': '#comments'
+      }
       {
         # Math.random()
         'begin': '\\s*(\\.)\\s*(\\w+)\\s*(?=\\()'

spec/javascript-spec.coffee

@@ -1564,6 +1564,15 @@ describe "Javascript grammar", ->
       expect(tokens[4]).toEqual value: ')', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.end.bracket.round.js']
       expect(tokens[6]).not.toEqual value: 'log', scopes: ['source.js', 'meta.method-call.js', 'support.function.console.js']
 
+      {tokens} = grammar.tokenizeLine('console/**/.log()')
+      expect(tokens[0]).toEqual value: 'console', scopes: ['source.js', 'entity.name.type.object.console.js']
+      expect(tokens[1]).toEqual value: '/*', scopes: ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
+      expect(tokens[2]).toEqual value: '*/', scopes: ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
+      expect(tokens[3]).toEqual value: '.', scopes: ['source.js', 'meta.method-call.js', 'meta.delimiter.method.period.js']
+      expect(tokens[4]).toEqual value: 'log', scopes: ['source.js', 'meta.method-call.js', 'support.function.console.js']
+      expect(tokens[5]).toEqual value: '(', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.begin.bracket.round.js']
+      expect(tokens[6]).toEqual value: ')', scopes: ['source.js', 'meta.method-call.js', 'meta.arguments.js', 'punctuation.definition.arguments.end.bracket.round.js']
+
       lines = grammar.tokenizeLines '''
         console
         .log();