merging/improving @rolftimmermans fix/tests for jashkenas#2007

jugglinmike · Feb 14, 2012 · 28a1101 · 28a1101
1 parent 8248601
commit 28a1101
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/lib/coffee-script/rewriter.js b/lib/coffee-script/rewriter.js
diff --git a/src/rewriter.coffee b/src/rewriter.coffee
@@ -167,7 +167,7 @@ class exports.Rewriter
 
     @scanTokens (token, i, tokens) ->
       tag     = token[0]
-      noCall  = yes if tag in ['CLASS', 'IF', 'FOR']
+      noCall  = yes if tag in ['CLASS', 'IF', 'FOR', 'WHILE']
       [prev, current, next] = tokens[i - 1 .. i + 1]
       callObject  = not noCall and tag is 'INDENT' and
                     next and next.generated and next[0] is '{' and

diff --git a/test/comprehensions.coffee b/test/comprehensions.coffee
@@ -485,3 +485,17 @@ test "#1910: loop index should be mutable within a loop iteration and immutable
     ++iterations
   eq 6, k
   eq 5, iterations
+
+test "#2007: Return object literal from comprehension", ->
+  y = for x in [1, 2]
+    foo: "foo" + x
+  eq 2, y.length
+  eq "foo1", y[0].foo
+  eq "foo2", y[1].foo
+
+  x = 2
+  y = while x
+    x: --x
+  eq 2, y.length
+  eq 1, y[0].x
+  eq 0, y[1].x
diff --git a/test/objects.coffee b/test/objects.coffee
@@ -269,10 +269,3 @@ test "#1961, #1974, regression with compound assigning to an implicit object", -
     four: 4
 
   eq obj.four, 4
-
-test "#2007: Return object literal from comprehension", ->
-  y = for x in [1, 2]
-    foo: "foo"
-    bar: "bar"
-
-  eq y[0].foo, "foo"