From dc821f2e4c7e793f721cfebc3634861093c58da8 Mon Sep 17 00:00:00 2001
From: Jeremy Ashkenas <jashkenas@gmail.com>
Date: Wed, 30 Dec 2009 19:26:37 -0500
Subject: [PATCH] be more vigorous about  removing mid-expression newlines,
 'when' closes implicit blocks, a better comment-detecting regex lexer that
 doesn't eat outdents

---
 lib/coffee_script/lexer.rb | 13 ++++++++-----
 lib/coffee_script/nodes.rb |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/coffee_script/lexer.rb b/lib/coffee_script/lexer.rb
index bf588c48..1f13c83c 100644
--- a/lib/coffee_script/lexer.rb
+++ b/lib/coffee_script/lexer.rb
@@ -24,7 +24,7 @@ module CoffeeScript
     JS         = /\A(``|`(.*?)[^\\]`)/m
     OPERATOR   = /\A([+\*&|\/\-%=<>:!]+)/
     WHITESPACE = /\A([ \t]+)/
-    COMMENT    = /\A((#[^\n]*\s*)+)/m
+    COMMENT    = /\A((#[^\n]*(\s(?=#))*)+)/m
     CODE       = /\A(=>)/
     REGEX      = /\A(\/(.*?)[^\\]\/[imgy]{0,4})/
     MULTI_DENT = /\A((\n+([ \t]*(?=\S))?)+)/
@@ -43,12 +43,13 @@ module CoffeeScript
 
     # Outdents that come before these tokens don't signify the end of the
     # expression.
-    EXPRESSION_TAIL = [:CATCH, :WHEN, :ELSE, :FINALLY, ')', ']', '}']
+    EXPRESSION_START = [:INDENT, '{', '(', '[']
+    EXPRESSION_TAIL  = [:CATCH, :OUTDENT, :WHEN, :ELSE, :FINALLY, ')', ']', '}']
     
     # Single-line flavors of block expressions that have unclosed endings.
     # The grammar can't disambiguate them, so we insert the implicit indentation.
     SINGLE_LINERS  = [:ELSE, "=>", :TRY, :FINALLY, :THEN]
-    SINGLE_CLOSERS = ["\n", :CATCH, :FINALLY, :ELSE, :OUTDENT]
+    SINGLE_CLOSERS = ["\n", :CATCH, :FINALLY, :ELSE, :OUTDENT, :WHEN]
 
     # The inverse mappings of token pairs we're trying to fix up.
     INVERSES = {:INDENT => :OUTDENT, :OUTDENT => :INDENT, '(' => ')', ')' => '('}
@@ -65,6 +66,7 @@ module CoffeeScript
         @chunk = @code[@i..-1]
         extract_next_token
       end
+      puts "original stream: #{@tokens.inspect}" if ENV['VERBOSE']
       close_indentation
       remove_mid_expression_newlines
       move_commas_outside_outdents
@@ -235,7 +237,9 @@ module CoffeeScript
     # this, remove their trailing newlines.
     def remove_mid_expression_newlines
       scan_tokens do |prev, token, post, i|
-        @tokens.delete_at(i) if post && EXPRESSION_TAIL.include?(post[0]) && token[0] == "\n" && prev[0] == :OUTDENT
+        @tokens.delete_at(i) if post && EXPRESSION_TAIL.include?(post[0]) &&
+                                        token[0] == "\n" # &&
+                                        # EXPRESSION_START.include?(prev[0])
       end
     end
 
@@ -310,7 +314,6 @@ module CoffeeScript
       verbose = ENV['VERBOSE']
       stack, debt = [], Hash.new(0)
       stack_stats = lambda { "stack: #{stack.inspect} debt: #{debt.inspect}" }
-      puts "original stream: #{@tokens.inspect}" if verbose
       scan_tokens do |prev, token, post, i|
         tag, inv = token[0], INVERSES[token[0]]
         if [:INDENT, '('].include?(tag)
diff --git a/lib/coffee_script/nodes.rb b/lib/coffee_script/nodes.rb
index 11d5f1f4..7b26876f 100644
--- a/lib/coffee_script/nodes.rb
+++ b/lib/coffee_script/nodes.rb
@@ -469,8 +469,8 @@ module CoffeeScript
       indent = o[:indent]
       o[:indent] += TAB
       props = @properties.map { |prop|
-        joiner = prop == @properties.last ? '' : prop.is_a?(CommentNode) ? "\n" : ",\n"
-        o[:indent] + prop.compile(o) + joiner
+        joiner = prop == @properties.first ? '' : prop.is_a?(CommentNode) ? "\n" : ",\n"
+        joiner + o[:indent] + prop.compile(o)
       }.join('')
       write("{\n#{props}\n#{indent}}")
     end