Fix #4686: if a CSX interpolation contains comments, not just inner C…

…SX (JSX) tags, it needs to be wrapped in braces (#4689)
jashkenas · Sep 16, 2017 · aecc115 · aecc115
1 parent 4c41831
commit aecc115
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/lib/coffeescript/nodes.js b/lib/coffeescript/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -3403,7 +3403,7 @@ exports.StringWithInterpolations = class StringWithInterpolations extends Base
       else
         fragments.push @makeCode '$' unless @csx
         code = element.compileToFragments(o, LEVEL_PAREN)
-        unless @isNestedTag element
+        if not @isNestedTag(element) or code.some((fragment) -> fragment.comments?)
           code = @wrapInBraces code
           # Flag the `{` and `}` fragments as having been generated by this
           # `StringWithInterpolations` node, so that `compileComments` knows

diff --git a/test/csx.coffee b/test/csx.coffee
@@ -711,3 +711,34 @@ test 'unspaced less than after CSX works but is not encouraged', ->
 
       res = 2 < div;
     '''
+
+test '#4686: comments inside interpolations that also contain CSX tags', ->
+  eqJS '''
+    <div>
+      {
+        # comment
+        <div />
+      }
+    </div>
+  ''', '''
+    <div>
+      {  // comment
+    <div />}
+    </div>;
+  '''
+
+test '#4686: comments inside interpolations that also contain CSX attributes', ->
+  eqJS '''
+    <div>
+      <div anAttr={
+        # comment
+        "value"
+      } />
+    </div>
+  ''', '''
+    <div>
+      {  // comment
+    <div anAttr={"value"} />}
+    </div>;
+  '''
+