allow leading logical inside if condition

Author: helixbass

lib/coffeescript/rewriter.js

@@ -645,7 +645,8 @@ exports.Rewriter = class Rewriter
     condition = (token, i) ->
       [tag] = token
       [prevTag] = @tokens[i - 1]
-      tag is 'TERMINATOR' or (tag is 'INDENT' and prevTag not in SINGLE_LINERS)
+      [nextTag] = @tokens[i + 1] unless i is @tokens.length - 1
+      tag is 'TERMINATOR' and nextTag not in LEADING_LOGICAL or (tag is 'INDENT' and prevTag not in SINGLE_LINERS)
 
     action = (token, i) ->
       if token[0] isnt 'INDENT' or (token.generated and not token.fromThen)
@@ -674,8 +675,8 @@ exports.Rewriter = class Rewriter
   # LEADING_OR token to disambiguate grammar.
   tagLeadingLogical: ->
     @scanTokens (token, i, tokens) ->
-      return 1 unless token[0] is 'TERMINATOR' and tokens.length >= i + 2 and (operatorToken = tokens[i + 1])[0] in ['&&', '||']
-      token[0] = "LEADING_#{if operatorToken[0] is '&&' then 'AND' else 'OR'}"
+      return 1 unless token[0] is 'TERMINATOR' and tokens.length >= i + 2 and (operatorToken = tokens[i + 1])[0] in LEADING_LOGICAL
+      token[0] = "LEADING_#{LEADING_LOGICAL_NAMES[operatorToken[0]]}"
       token[1] = operatorToken[1]
       token[2].last_line = operatorToken[2].last_line
       token[2].last_column = operatorToken[2].last_column
@@ -775,3 +776,8 @@ DISCARDED = ['(', ')', '[', ']', '{', '}', '.', '..', '...', ',', '=', '++', '--
   'INTERPOLATION_START', 'INTERPOLATION_END', 'LEADING_WHEN', 'OUTDENT', 'PARAM_END',
   'REGEX_START', 'REGEX_END', 'RETURN', 'STRING_END', 'THROW', 'UNARY', 'YIELD'
 ].concat IMPLICIT_UNSPACED_CALL.concat IMPLICIT_END.concat CALL_CLOSERS.concat CONTROL_IN_IMPLICIT
+
+LEADING_LOGICAL_NAMES =
+  '&&': 'AND'
+  '||': 'OR'
+LEADING_LOGICAL = Object.keys LEADING_LOGICAL_NAMES

src/rewriter.coffee

@@ -638,3 +638,23 @@ test "logical and/or should continue lines", ->
       c:
         1
     or 3
+
+  eq 3,
+    if yes
+    and yes
+      3
+
+  eq 3,
+    if yes
+     and yes
+      3
+
+  eq 3,
+    if yes
+      and yes
+      3
+
+  eq 3,
+    if yes
+       and yes
+      3