Lexer: Incorrect JS generated for function called with an object with a conditional property

[barshow]

working

alert
  val: "hello"
  val2: "all good"
  val3: "works" if true

compiles correctly to

alert({
  val: "hello",
  val2: "all good",
  val3: true ? "works" : void 0
});

incorrect compilation

alert
  val3: "works" if true
  val: "hello"
  val2: "all good"

compiles incorrectly to

alert(true ? {
  val3: "works"
} : void 0, {
  val: "hello",
  val2: "all good"
});

[showell]

This seems like a bug to me. For the latter you can the correct compilation by adding parens around "works" if true, but it seems like if you omit the parentheses, it should just be a syntax error.

[jqr]

Yeah I'm seeing this too.

1 || 
 a: 1
 b: 2
 c: 3

previous/expected

1 || {
  a: 1,
  b: 2,
  c: 3
});

actual

1 || {
  a: 1
};

({
  b: 2,
  c: 3
});

http://coffeescript.org/#try:1%20%7C%7C%20%0A%20a%3A%201%0A%20b%3A%202%0A%20c%3A%203

[trinary]

Triaging old issues: seems like the expected matches the output from the #try link at this point, so this can be closed.

[vendethiel]

I think there's a lot of issues we can close with that implicit object/call merge. :)

[GeoffreyBooth]

As of 2.0.0-beta4 this compiles as expected:

alert({
  val3: true ? "works" : void 0,
  val: "hello",
  val2: "all good"
});