allow leading logical operators

helixbass · helixbass · commit b6840cf454bf · 2018-05-16T18:06:31.000-04:00
diff --git a/lib/coffeescript/lexer.js b/lib/coffeescript/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -1293,7 +1293,7 @@ POSSIBLY_DIVISION   = /// ^ /=?\s ///
 # Other regexes.
 HERECOMMENT_ILLEGAL = /\*\//
 
-LINE_CONTINUER      = /// ^ \s* (?: , | \??\.(?![.\d]) | \??:: ) ///
+LINE_CONTINUER      = /// ^ \s* (?: , | \??\.(?![.\d]) | \??:: | and#{' '} | or#{' '} | && | \|\| ) ///
 
 STRING_INVALID_ESCAPE = ///
   ( (?:^|[^\\]) (?:\\\\)* )        # Make sure the escape isn’t escaped.
diff --git a/test/formatting.coffee b/test/formatting.coffee
@@ -454,3 +454,32 @@ test "#3736: chaining after do IIFE", ->
   eq 4,
     do b
     .c
+
+test "logical and/or should continue lines", ->
+  ok not (
+    yes
+    and no
+  )
+
+  ok not (
+    1
+      and 0
+  )
+
+  ok 'abc'
+    && 123
+
+  ok 'abc'
+  && 123
+
+  ok 'abc'
+  or 123
+
+  ok 'abc'
+    or 123
+
+  ok 'abc'
+  || 123
+
+  ok 'abc'
+    || 123
