Update docs output for 2.0.0

jashkenas · Sep 18, 2017 · a2a2e76 · a2a2e76
1 parent 19231db
commit a2a2e76
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/docs/v2/annotated-source/nodes.html b/docs/v2/annotated-source/nodes.html
@@ -6850,7 +6850,7 @@ <h3 id="stringwithinterpolations">StringWithInterpolations</h3>
       <span class="hljs-keyword">else</span>
         fragments.push @makeCode <span class="hljs-string">'$'</span> <span class="hljs-keyword">unless</span> @csx
         code = element.compileToFragments(o, LEVEL_PAREN)
-        <span class="hljs-keyword">unless</span> @isNestedTag element
+        <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> @isNestedTag(element) <span class="hljs-keyword">or</span> code.some(<span class="hljs-function"><span class="hljs-params">(fragment)</span> -&gt;</span> fragment.comments?)
           code = @wrapInBraces code</pre></div></div>
 
         </li>

diff --git a/docs/v2/test.html b/docs/v2/test.html
@@ -6482,6 +6482,37 @@ <h1>CoffeeScript Test Suite</h1>
       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>;
+  '''
+
+
 </script>
 <script type="text/x-coffeescript" class="test" id="error_messages">
 # Error Formatting