don't include object keys

helixbass · helixbass · commit fe0298c67e4c · 2018-05-16T20:46:36.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]) | \??:: | and#{' '} | or#{' '} | && | \|\| ) ///
+LINE_CONTINUER      = /// ^ \s* (?: , | \??\.(?![.\d]) | \??:: | and\s+(?!:)\S | or\s+(?!:)\S | && | \|\| ) ///
 
 STRING_INVALID_ESCAPE = ///
   ( (?:^|[^\\]) (?:\\\\)* )        # Make sure the escape isn’t escaped.
diff --git a/test/formatting.coffee b/test/formatting.coffee
@@ -483,3 +483,13 @@ test "logical and/or should continue lines", ->
 
   ok 'abc'
     || 123
+
+  a =
+    and   : 'b'
+    or    : 'a'
+  ok 'a' is a.or
+
+  b =
+    or    : 'b'
+    and   : 'a'
+  ok 'a' is b.and
