github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-18 11:31:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixing comment-within-objecta-and-array-literal printing for the new expression regime.

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-01-03 18:35:03 -05:00
parent bd2597c6b8
commit 97f16c0e9c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/coffee_script/nodes.rb
View File

@@ -533,10 +533,11 @@ module CoffeeScript
joins = Hash.new("\n") joins = Hash.new("\n")
non_comments = @properties.select {|p| !p.is_a?(CommentNode) } non_comments = @properties.select {|p| !p.is_a?(CommentNode) }
non_comments.each {|p| joins[p] = p == non_comments.last ? "\n" : ",\n" } non_comments.each {|p| joins[p] = p == non_comments.last ? "\n" : ",\n" }
props = @properties.map { |prop| props = @properties.map { |prop|
join = joins[prop] join = joins[prop]
join = '' if prop == @properties.last join = '' if prop == @properties.last
o[:indent] + prop.compile(o) + join idt = prop.is_a?(CommentNode) ? '' : o[:indent]
"#{idt}#{prop.compile(o)}#{join}"
}.join('') }.join('')
write("{\n#{props}\n#{indent}}") write("{\n#{props}\n#{indent}}")
end end
@@ -551,11 +552,14 @@ module CoffeeScript
end end
def compile_node(o) def compile_node(o)
indent = o[:indent]
o[:indent] += TAB
objects = @objects.map { |obj| objects = @objects.map { |obj|
joiner = obj.is_a?(CommentNode) ? "\n#{o[:indent] + TAB}" : obj == @objects.last ? '' : ', ' code = obj.compile(o)
obj.compile(o.merge(:indent => o[:indent] + TAB)) + joiner obj.is_a?(CommentNode) ? "\n#{code}\n#{o[:indent]}" :
obj == @objects.last ? code : "#{code}, "
}.join('') }.join('')
ending = objects.include?("\n") ? "\n#{o[:indent]}]" : ']' ending = objects.include?("\n") ? "\n#{indent}]" : ']'
write("[#{objects}#{ending}") write("[#{objects}#{ending}")
end end
end end