fixed comment, used toJS, added error tests, fixed error in identifier regex, fixed interpolation inside attributes value and added test

Author: xixixao

lib/coffeescript/grammar.js

@@ -48,7 +48,7 @@ exports.Lexer = class Lexer
     @seenExport = no             # Used to recognize EXPORT FROM? AS? tokens.
     @importSpecifierList = no    # Used to identify when in an IMPORT {...} FROM? ...
     @exportSpecifierList = no    # Used to identify when in an EXPORT {...} FROM? ...
-    @includesCSX = no            # Used to optimize CSX checks
+    @includesCSX = no            # Used to optimize CSX checks.
 
     @chunkLine =
       opts.line or 0             # The start line for the current @chunk.
@@ -715,7 +715,7 @@ exports.Lexer = class Lexer
       offsetInChunk += index
 
     unless str[...closingDelimiter.length] is closingDelimiter
-      @error "missing #{closingDelimiter}", length: closingDelimiter.length
+      @error "missing #{closingDelimiter}", length: delimiter.length
 
     [firstToken, ..., lastToken] = tokens
     firstToken[2].first_column -= delimiter.length
@@ -1065,7 +1065,7 @@ IDENTIFIER = /// ^
 ///
 
 CSX_IDENTIFIER = /// ^
-  (?!\d<)
+  (?![\d<])
   ( (?: (?!\s)[\-\.$\w\x7f-\uffff] )+ ) # like `IDENTIFIER` but includes `-`, `.`s
   ( [^\S]* = (?!=) )?  # Is this an attribute name?
 ///

lib/coffeescript/lexer.js

@@ -2839,6 +2839,11 @@ exports.StringWithInterpolations = class StringWithInterpolations extends Base
   shouldCache: -> @body.shouldCache()
 
   compileNode: (o) ->
+    if @csxAttribute
+      wrapped = new Parens new StringWithInterpolations @body
+      wrapped.csxAttribute = yes
+      return wrapped.compileNode o
+
     # Assumes that `expr` is `Value` » `StringLiteral` or `Op`
     expr = @body.unwrap()
 

lib/coffeescript/nodes.js

@@ -1,7 +1,6 @@
 # We usually do not check the actual JS output from the compiler, but since
 # CSX is not readily supported by Node, we do it in this case
-eqCSX = (cs, js) ->
-  eq CoffeeScript.compile(cs, {bare: true}), js + '\n'
+eqCSX = (cs, js) -> eq toJS(cs), js
 
 test 'self closing', ->
   eqCSX '''
@@ -120,6 +119,13 @@ test 'regex in interpolation', ->
     <div x={/>asds/}><div />{/>asdsad</}</div>;
   '''
 
+test 'interpolation in string attribute value', ->
+  eqCSX '''
+    <div x="Hello #{world}" />
+  ''', '''
+    <div x={`Hello ${world}`} />;
+  '''
+
 # Unlike in coffee-react-transform
 test 'bare numbers not allowed', ->
   throws -> CoffeeScript.compile '<div x=3 />'
@@ -130,7 +136,7 @@ test 'bare expressions not allowed', ->
 test 'bare complex expressions not allowed', ->
   throws -> CoffeeScript.compile '<div x=f(3) />'
 
-test 'unescaped opening tag arrows disallowed', ->
+test 'unescaped opening tag angle bracket disallowed', ->
   throws -> CoffeeScript.compile '<Person><<</Person>'
 
 test 'space around equal sign', ->
@@ -143,10 +149,10 @@ test 'space around equal sign', ->
 # The following tests were adopted from James Friend's
 # https://github.com/jsdf/coffee-react-transform
 
-test 'ambigious tag-like expression', ->
+test 'ambiguous tag-like expression', ->
   throws -> CoffeeScript.compile 'x = a <b > c'
 
-test 'ambigious tag', ->
+test 'ambiguous tag', ->
   eqCSX '''
     a <b > c </b>
   ''', '''

lib/coffeescript/parser.js

@@ -1545,3 +1545,43 @@ test "#4248: Unicode code point escapes", ->
     '\\u{a}\\u{1111110000}'
       \    ^\^^^^^^^^^^^^^
   '''
+
+test "csx error: non-matching tag names", ->
+  assertErrorFormat '''
+    <div><span></div></span>
+  ''',
+  '''
+    [stdin]:1:7: error: expected corresponding CSX closing tag for span
+    <div><span></div></span>
+          ^^^^
+  '''
+
+test "csx error: bare expressions not allowed", ->
+  assertErrorFormat '''
+    <div x=3 />
+  ''',
+  '''
+    [stdin]:1:8: error: expected wrapped or quoted CSX attribute
+    <div x=3 />
+           ^
+  '''
+
+test "csx error: unescaped opening tag angle bracket disallowed", ->
+  assertErrorFormat '''
+    <Person><<</Person>
+  ''',
+  '''
+    [stdin]:1:9: error: unexpected <<
+    <Person><<</Person>
+            ^^
+  '''
+
+test "csx error: ambiguous tag-like expression", ->
+  assertErrorFormat '''
+    x = a <b > c
+  ''',
+  '''
+    [stdin]:1:10: error: missing </
+    x = a <b > c
+             ^
+  '''