refract 1.0.0.beta1 → 1.1.0

data/lib/refract/formatter.rb

@@ -2,17 +2,31 @@
 
 module Refract
 	class Formatter < BasicVisitor
-		def initialize
-			super
+		Result = Data.define(:source, :source_map)
+
+		def initialize(starting_line: 1)
+			super()
 			@buffer = []
 			@source_map = []
-			@current_line = 1
+			@current_line = starting_line
 			@indent = 0
 		end
 
+		def around_visit(node)
+			if (start_line = node.start_line)
+				@source_map[@current_line] = start_line
+			end
+
+			super
+		end
+
 		def format_node(node)
 			visit(node)
-			@buffer.join
+
+			Result.new(
+				source: @buffer.join,
+				source_map: @source_map,
+			)
 		end
 
 		visit AliasGlobalVariableNode do |node|
@@ -69,7 +83,13 @@ module Refract
 		visit AssocNode do |node|
 			case node.key
 			when SymbolNode
-				push node.key.unescaped
+				if node.key.quoted
+					doubles do
+						push node.key.unescaped.gsub('"', '\"')
+					end
+				else
+					push node.key.unescaped
+				end
 				push ":"
 				space unless ImplicitNode === node.value
 				visit node.value
@@ -90,32 +110,30 @@ module Refract
 		end
 
 		visit BeginNode do |node|
-			outdent do
-				push "begin"
-
-				indent do
-					visit node.statements
-				end
+			push "begin"
 
-				new_line
+			indent do
+				visit node.statements
+			end
 
-				if node.rescue_clause
-					visit node.rescue_clause
-					new_line
-				end
+			new_line
 
-				if node.else_clause
-					visit node.else_clause
-					new_line
-				end
+			if node.rescue_clause
+				visit node.rescue_clause
+				new_line
+			end
 
-				if node.ensure_clause
-					visit node.ensure_clause
-					new_line
-				end
+			if node.else_clause
+				visit node.else_clause
+				new_line
+			end
 
-				push "end"
+			if node.ensure_clause
+				visit node.ensure_clause
+				new_line
 			end
+
+			push "end"
 		end
 
 		visit BlockArgumentNode do |node|
@@ -187,10 +205,11 @@ module Refract
 		visit CallNode do |node|
 			if node.receiver
 				visit node.receiver
+				push "&" if node.safe_navigation
 				push "."
 			end
 
-			push node.message
+			push node.name
 
 			case node.block
 			when BlockNode
@@ -349,18 +368,18 @@ module Refract
 			visit node.value
 		end
 
-		visit ConstantPath do |node|
-			visit node.parent
-			push "::"
-			push node.name
-		end
-
 		visit ConstantPathAndWriteNode do |node|
 			visit node.target
 			push " &&= "
 			visit node.value
 		end
 
+		visit ConstantPathNode do |node|
+			visit node.parent
+			push "::"
+			push node.name
+		end
+
 		visit ConstantPathOperatorWriteNode do |node|
 			visit node.target
 			space
@@ -563,25 +582,31 @@ module Refract
 		end
 
 		visit IfNode do |node|
-			# Check if this is an elsif by looking at the parent
-			if IfNode === @stack[-2]
-				push "elsif "
+			if node.inline
+				visit node.statements
+				push " if "
+				visit node.predicate
 			else
-				push "if "
-			end
-			visit node.predicate
-			if node.statements
-				indent do
-					visit node.statements
+				# Check if this is an elsif by looking at the parent
+				if IfNode === @stack[-2]
+					push "elsif "
+				else
+					push "if "
+				end
+				visit node.predicate
+				if node.statements
+					indent do
+						visit node.statements
+					end
+				end
+				if node.subsequent
+					new_line
+					visit node.subsequent
+				end
+				unless IfNode === @stack[-2]
+					new_line
+					push "end"
 				end
-			end
-			if node.subsequent
-				new_line
-				visit node.subsequent
-			end
-			unless IfNode === @stack[-2]
-				new_line
-				push "end"
 			end
 		end
 
@@ -1101,7 +1126,7 @@ module Refract
 		end
 
 		visit StatementsNode do |node|
-			visit_each(node.body) { new_line }
+			visit_each(node.body.flat_map { |n| (Refract::StatementsNode === n) ? n.body : n }) { new_line }
 		end
 
 		visit StringNode do |node|
@@ -1112,17 +1137,39 @@ module Refract
 
 		visit SuperNode do |node|
 			push "super"
-			if node.arguments
+			case node.block
+			when BlockNode
+				if node.arguments
+					parens { visit node.arguments }
+				end
+
+				space
+				visit node.block
+			when BlockArgumentNode
 				parens do
-					visit node.arguments
+					if node.arguments
+						visit node.arguments
+						push ", "
+					end
+
+					visit node.block
+				end
+			else
+				if node.arguments
+					parens { visit node.arguments }
 				end
 			end
-			visit node.block if node.block
 		end
 
 		visit SymbolNode do |node|
 			push ":"
-			push node.unescaped
+			if node.quoted
+				doubles do
+					push node.unescaped.gsub('"', '\"')
+				end
+			else
+				push node.unescaped
+			end
 		end
 
 		visit TrueNode do |node|
@@ -1136,34 +1183,46 @@ module Refract
 		end
 
 		visit UnlessNode do |node|
-			push "unless "
-			visit node.predicate
+			if node.inline
+				visit node.statements
+				push " unless "
+				visit node.predicate
+			else
+				push "unless "
+				visit node.predicate
 
-			if node.statements
-				indent do
-					visit node.statements
+				if node.statements
+					indent do
+						visit node.statements
+					end
+				end
+
+				if node.else_clause
+					new_line
+					visit node.else_clause
 				end
-			end
 
-			if node.else_clause
 				new_line
-				visit node.else_clause
+				push "end"
 			end
-
-			new_line
-			push "end"
 		end
 
 		visit UntilNode do |node|
-			push "until "
-			visit node.predicate
-			if node.statements
-				indent do
-					visit node.statements
+			if node.inline
+				visit node.statements
+				push " until "
+				visit node.predicate
+			else
+				push "until "
+				visit node.predicate
+				if node.statements
+					indent do
+						visit node.statements
+					end
 				end
+				new_line
+				push "end"
 			end
-			new_line
-			push "end"
 		end
 
 		visit WhenNode do |node|
@@ -1176,15 +1235,21 @@ module Refract
 		end
 
 		visit WhileNode do |node|
-			push "while "
-			visit node.predicate
-			if node.statements
-				indent do
-					visit node.statements
+			if node.inline
+				visit node.statements
+				push " while "
+				visit node.predicate
+			else
+				push "while "
+				visit node.predicate
+				if node.statements
+					indent do
+						visit node.statements
+					end
 				end
+				new_line
+				push "end"
 			end
-			new_line
-			push "end"
 		end
 
 		visit XStringNode do |node|
@@ -1218,7 +1283,8 @@ module Refract
 		end
 
 		private def new_line
-			push "\n#{"\t" * @indent}"
+			@buffer << "\n#{"\t" * @indent}"
+			@current_line += 1
 		end
 
 		private def indent