Merge pull request #147 from atom/wl-clamp-embedded-js

Clamp embedded JS patterns

Author: Wliu

grammars/coffeescript.cson

@@ -84,21 +84,20 @@
     ]
   }
   {
-    'begin': '`'
-    'beginCaptures':
-      '0':
+    'match': '(`)(.*)(`)'
+    'name': 'string.quoted.script.coffee'
+    'captures':
+      '1':
         'name': 'punctuation.definition.string.begin.coffee'
-    'end': '`'
-    'endCaptures':
-      '0':
+      '2':
+        'name': 'source.js.embedded.coffee'
+        'patterns': [
+          {
+            'include': 'source.js'
+          }
+        ]
+      '3':
         'name': 'punctuation.definition.string.end.coffee'
-    'name': 'string.quoted.script.coffee'
-    'contentName': 'source.embedded.js'
-    'patterns': [
-      {
-        'include': 'source.js'
-      }
-    ]
   }
   {
     'begin': '(?<!#)###(?!#)'

spec/coffee-script-spec.coffee

@@ -528,19 +528,26 @@ describe "CoffeeScript grammar", ->
     runs ->
       {tokens} = grammar.tokenizeLine("`;`")
       expect(tokens[0]).toEqual value: "`", scopes: ["source.coffee", "string.quoted.script.coffee", "punctuation.definition.string.begin.coffee"]
-      expect(tokens[1]).toEqual value: ";", scopes: ["source.coffee", "string.quoted.script.coffee", "source.embedded.js", "punctuation.terminator.statement.js"]
+      expect(tokens[1]).toEqual value: ";", scopes: ["source.coffee", "string.quoted.script.coffee", "source.js.embedded.coffee", "punctuation.terminator.statement.js"]
       expect(tokens[2]).toEqual value: "`", scopes: ["source.coffee", "string.quoted.script.coffee", "punctuation.definition.string.end.coffee"]
 
       lines = grammar.tokenizeLines """
         `var a = 1;`
         a = 2
         """
       expect(lines[0][0]).toEqual value: '`', scopes: ["source.coffee", "string.quoted.script.coffee", "punctuation.definition.string.begin.coffee"]
-      expect(lines[0][1]).toEqual value: 'var', scopes: ["source.coffee", "string.quoted.script.coffee", "source.embedded.js", "storage.type.var.js"]
-      expect(lines[0][6]).toEqual value: ';', scopes: ["source.coffee", "string.quoted.script.coffee", "source.embedded.js", "punctuation.terminator.statement.js"]
+      expect(lines[0][1]).toEqual value: 'var', scopes: ["source.coffee", "string.quoted.script.coffee", "source.js.embedded.coffee", "storage.type.var.js"]
+      expect(lines[0][6]).toEqual value: ';', scopes: ["source.coffee", "string.quoted.script.coffee", "source.js.embedded.coffee", "punctuation.terminator.statement.js"]
       expect(lines[0][7]).toEqual value: '`', scopes: ["source.coffee", "string.quoted.script.coffee", "punctuation.definition.string.end.coffee"]
       expect(lines[1][0]).toEqual value: 'a', scopes: ["source.coffee", "variable.assignment.coffee"]
 
+      {tokens} = grammar.tokenizeLine("`// comment` a = 2")
+      expect(tokens[0]).toEqual value: '`', scopes: ["source.coffee", "string.quoted.script.coffee", "punctuation.definition.string.begin.coffee"]
+      expect(tokens[1]).toEqual value: '//', scopes: ["source.coffee", "string.quoted.script.coffee", "source.js.embedded.coffee", "comment.line.double-slash.js", "punctuation.definition.comment.js"]
+      expect(tokens[2]).toEqual value: ' comment', scopes: ["source.coffee", "string.quoted.script.coffee", "source.js.embedded.coffee", "comment.line.double-slash.js"]
+      expect(tokens[3]).toEqual value: '`', scopes: ["source.coffee", "string.quoted.script.coffee", "punctuation.definition.string.end.coffee"]
+      expect(tokens[5]).toEqual value: 'a', scopes: ["source.coffee", "variable.assignment.coffee"]
+
   describe "function calls", ->
     it "tokenizes function calls", ->
       {tokens} = grammar.tokenizeLine('functionCall()')