From 698784e10370b021b5b9952a9f0ab3f6850926c4 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Sat, 26 Jun 2010 17:20:13 -0400 Subject: [PATCH] fixing issue #454 single-line function with single-line if/else --- lib/rewriter.js | 2 +- src/rewriter.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rewriter.js b/lib/rewriter.js index 61a349f7..b13c4ecc 100644 --- a/lib/rewriter.js +++ b/lib/rewriter.js @@ -246,7 +246,7 @@ idx += 1; tok = this.tokens[idx]; pre = this.tokens[idx - 1]; - if ((!tok || (include(SINGLE_CLOSERS, tok[0]) && tok[1] !== ';' && parens === 0) || (tok[0] === ')' && parens === 0)) && !(starter === 'ELSE' && tok[0] === 'ELSE')) { + if ((!tok || (include(SINGLE_CLOSERS, tok[0]) && tok[1] !== ';' && parens === 0) || (tok[0] === ')' && parens === 0)) && !(tok[0] === 'ELSE' && !('IF' === starter || 'THEN' === starter))) { insertion = pre[0] === "," ? idx - 1 : idx; outdent = ['OUTDENT', 2, token[2]]; outdent.generated = true; diff --git a/src/rewriter.coffee b/src/rewriter.coffee index cd22e8d0..7cdae0cb 100644 --- a/src/rewriter.coffee +++ b/src/rewriter.coffee @@ -174,7 +174,7 @@ exports.Rewriter: class Rewriter if (not tok or (include(SINGLE_CLOSERS, tok[0]) and tok[1] isnt ';' and parens is 0) or (tok[0] is ')' and parens is 0)) and - not (starter is 'ELSE' and tok[0] is 'ELSE') + not (tok[0] is 'ELSE' and starter not in ['IF', 'THEN']) insertion: if pre[0] is "," then idx - 1 else idx outdent: ['OUTDENT', 2, token[2]] outdent.generated: true