refract 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b42e2ba437813613a9e793d44876702acdf9c730426f890f5696c65dc930591
-  data.tar.gz: f920d8b6cba89d57710d8175f0b977445128c66e4936d0e6a0092f8d2338d292
+  metadata.gz: b6108db4a82b8d13ee9e82726fb9a546e9ca2307ebf798f9dc46c7088a4954b3
+  data.tar.gz: 8a1568765775444eef901017163818dd90e724da75f75c418ebc838f6f05cb73
 SHA512:
-  metadata.gz: 814f27c216c27736cb7caf003770855996af84c326637ce8f2edc7087d506e9a4228b7707f2824f852f0e1d333e948514efa6c60b130f4ca55b60aa67a923f04
-  data.tar.gz: d029a121d9ce0bdabe5a809de3e47d687f807b9978b815cf6138fd2fc73f221b76888d35094e96e05e2d691fd38546862831d008096b9a3677a237ffd77e7522
+  metadata.gz: 616aa31f777bee9127836f599337e4d23b7e1e28ec3b5089c979cc48d901b8e16d26e09390f6c716885464ad88125875288d4e5667ba3b0e5f1c1b164b7cfc69
+  data.tar.gz: bc620ad21498d5c4351c145047a5b29aa6ff73537809529594bb9c163c088f36f47de7590cf4fe1f2cdd5c04594a2d276bd439d9da19440771af108158ac1ab3

data/lib/refract/converter.rb

@@ -163,6 +163,7 @@ module Refract
 				name: node.name,
 				arguments: visit(node.arguments),
 				block: visit(node.block),
+				safe_navigation: node.safe_navigation?,
 			)
 		end
 
@@ -1135,6 +1136,7 @@ module Refract
 			SymbolNode.new(
 				prism_node: node,
 				unescaped: node.unescaped,
+				quoted: node.opening_loc && node.closing_loc,
 			)
 		end
 

data/lib/refract/formatter.rb

@@ -2,11 +2,13 @@
 
 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
 
@@ -20,7 +22,11 @@ module Refract
 
 		def format_node(node)
 			visit(node)
-			@buffer.join
+
+			Result.new(
+				source: @buffer.join,
+				source_map: @source_map,
+			)
 		end
 
 		visit AliasGlobalVariableNode do |node|
@@ -77,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
@@ -98,32 +110,30 @@ module Refract
 		end
 
 		visit BeginNode do |node|
-			outdent do
-				push "begin"
+			push "begin"
 
-				indent do
-					visit node.statements
-				end
-
-				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|
@@ -195,6 +205,7 @@ module Refract
 		visit CallNode do |node|
 			if node.receiver
 				visit node.receiver
+				push "&" if node.safe_navigation
 				push "."
 			end
 
@@ -1115,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|
@@ -1126,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|

data/lib/refract/nodes/call_node.rb

@@ -2,15 +2,16 @@
 
 module Refract
 	class CallNode < Node
-		def initialize(prism_node: nil, receiver: nil, name:, arguments: nil, block: nil)
+		def initialize(prism_node: nil, receiver: nil, name:, arguments: nil, block: nil, safe_navigation: nil)
 			@prism_node = prism_node => Prism::Node | nil
 			@receiver = receiver
 			@name = name => Symbol
 			@arguments = arguments
 			@block = block
+			@safe_navigation = safe_navigation
 			freeze
 		end
 
-		attr_accessor :receiver, :name, :arguments, :block
+		attr_accessor :receiver, :name, :arguments, :block, :safe_navigation
 	end
 end

data/lib/refract/nodes/symbol_node.rb

@@ -2,12 +2,13 @@
 
 module Refract
 	class SymbolNode < Node
-		def initialize(prism_node: nil, unescaped:)
+		def initialize(prism_node: nil, unescaped:, quoted:)
 			@prism_node = prism_node => Prism::Node | nil
 			@unescaped = unescaped
+			@quoted = quoted
 			freeze
 		end
 
-		attr_accessor :unescaped
+		attr_accessor :unescaped, :quoted
 	end
 end

data/lib/refract/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Refract
-	VERSION = "1.0.0"
+	VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refract
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Joel Drapper