refract 1.0.0.beta1 → 1.1.0

data/lib/refract/converter.rb

@@ -16,6 +16,7 @@ module Refract
 
 		visit Prism::AliasGlobalVariableNode do |node|
 			AliasGlobalVariableNode.new(
+				prism_node: node,
 				new_name: visit(node.new_name),
 				old_name: visit(node.old_name),
 			)
@@ -23,6 +24,7 @@ module Refract
 
 		visit Prism::AliasMethodNode do |node|
 			AliasMethodNode.new(
+				prism_node: node,
 				new_name: visit(node.new_name),
 				old_name: visit(node.old_name),
 			)
@@ -30,6 +32,7 @@ module Refract
 
 		visit Prism::AlternationPatternNode do |node|
 			AlternationPatternNode.new(
+				prism_node: node,
 				left: visit(node.left),
 				right: visit(node.right),
 			)
@@ -37,26 +40,30 @@ module Refract
 
 		visit Prism::AndNode do |node|
 			AndNode.new(
+				prism_node: node,
 				left: visit(node.left),
-				operator: node.operator_loc.slice,
+				operator: node.operator,
 				right: visit(node.right),
 			)
 		end
 
 		visit Prism::ArgumentsNode do |node|
 			ArgumentsNode.new(
+				prism_node: node,
 				arguments: node.arguments&.map { |n| visit(n) },
 			)
 		end
 
 		visit Prism::ArrayNode do |node|
 			ArrayNode.new(
+				prism_node: node,
 				elements: node.elements&.map { |n| visit(n) },
 			)
 		end
 
 		visit Prism::ArrayPatternNode do |node|
 			ArrayPatternNode.new(
+				prism_node: node,
 				constant: visit(node.constant),
 				requireds: node.requireds&.map { |n| visit(n) },
 				rest: visit(node.rest),
@@ -66,6 +73,7 @@ module Refract
 
 		visit Prism::AssocNode do |node|
 			AssocNode.new(
+				prism_node: node,
 				key: visit(node.key),
 				value: visit(node.value),
 			)
@@ -73,18 +81,21 @@ module Refract
 
 		visit Prism::AssocSplatNode do |node|
 			AssocSplatNode.new(
+				prism_node: node,
 				value: visit(node.value),
 			)
 		end
 
 		visit Prism::BackReferenceReadNode do |node|
 			BackReferenceReadNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::BeginNode do |node|
 			BeginNode.new(
+				prism_node: node,
 				statements: visit(node.statements),
 				rescue_clause: visit(node.rescue_clause),
 				else_clause: visit(node.else_clause),
@@ -94,18 +105,21 @@ module Refract
 
 		visit Prism::BlockArgumentNode do |node|
 			BlockArgumentNode.new(
+				prism_node: node,
 				expression: visit(node.expression),
 			)
 		end
 
 		visit Prism::BlockLocalVariableNode do |node|
 			BlockLocalVariableNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::BlockNode do |node|
 			BlockNode.new(
+				prism_node: node,
 				parameters: visit(node.parameters),
 				body: visit(node.body),
 			)
@@ -113,12 +127,14 @@ module Refract
 
 		visit Prism::BlockParameterNode do |node|
 			BlockParameterNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::BlockParametersNode do |node|
 			BlockParametersNode.new(
+				prism_node: node,
 				parameters: visit(node.parameters),
 				locals: node.locals&.map { |n| visit(n) },
 			)
@@ -126,12 +142,14 @@ module Refract
 
 		visit Prism::BreakNode do |node|
 			BreakNode.new(
+				prism_node: node,
 				arguments: visit(node.arguments),
 			)
 		end
 
 		visit Prism::CallAndWriteNode do |node|
 			CallAndWriteNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				read_name: node.read_name,
 				value: visit(node.value),
@@ -140,15 +158,18 @@ module Refract
 
 		visit Prism::CallNode do |node|
 			CallNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
-				message: node.message,
+				name: node.name,
 				arguments: visit(node.arguments),
 				block: visit(node.block),
+				safe_navigation: node.safe_navigation?,
 			)
 		end
 
 		visit Prism::CallOperatorWriteNode do |node|
 			CallOperatorWriteNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				read_name: node.read_name,
 				binary_operator: node.binary_operator,
@@ -158,6 +179,7 @@ module Refract
 
 		visit Prism::CallOrWriteNode do |node|
 			CallOrWriteNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				read_name: node.read_name,
 				value: visit(node.value),
@@ -166,6 +188,7 @@ module Refract
 
 		visit Prism::CallTargetNode do |node|
 			CallTargetNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				name: node.name,
 			)
@@ -173,6 +196,7 @@ module Refract
 
 		visit Prism::CapturePatternNode do |node|
 			CapturePatternNode.new(
+				prism_node: node,
 				value: visit(node.value),
 				target: visit(node.target),
 			)
@@ -180,6 +204,7 @@ module Refract
 
 		visit Prism::CaseMatchNode do |node|
 			CaseMatchNode.new(
+				prism_node: node,
 				predicate: visit(node.predicate),
 				conditions: node.conditions&.map { |n| visit(n) },
 				else_clause: visit(node.else_clause),
@@ -188,6 +213,7 @@ module Refract
 
 		visit Prism::CaseNode do |node|
 			CaseNode.new(
+				prism_node: node,
 				predicate: visit(node.predicate),
 				conditions: node.conditions&.map { |n| visit(n) },
 				else_clause: visit(node.else_clause),
@@ -196,6 +222,7 @@ module Refract
 
 		visit Prism::ClassNode do |node|
 			ClassNode.new(
+				prism_node: node,
 				constant_path: visit(node.constant_path),
 				superclass: visit(node.superclass),
 				body: visit(node.body),
@@ -204,6 +231,7 @@ module Refract
 
 		visit Prism::ClassVariableAndWriteNode do |node|
 			ClassVariableAndWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -211,6 +239,7 @@ module Refract
 
 		visit Prism::ClassVariableOperatorWriteNode do |node|
 			ClassVariableOperatorWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 				binary_operator: node.binary_operator,
@@ -219,6 +248,7 @@ module Refract
 
 		visit Prism::ClassVariableOrWriteNode do |node|
 			ClassVariableOrWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -226,18 +256,21 @@ module Refract
 
 		visit Prism::ClassVariableReadNode do |node|
 			ClassVariableReadNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::ClassVariableTargetNode do |node|
 			ClassVariableTargetNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::ClassVariableWriteNode do |node|
 			ClassVariableWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -245,6 +278,7 @@ module Refract
 
 		visit Prism::ConstantAndWriteNode do |node|
 			ConstantAndWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -252,6 +286,7 @@ module Refract
 
 		visit Prism::ConstantOperatorWriteNode do |node|
 			ConstantOperatorWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 				binary_operator: node.binary_operator,
@@ -260,6 +295,7 @@ module Refract
 
 		visit Prism::ConstantOrWriteNode do |node|
 			ConstantOrWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -267,13 +303,15 @@ module Refract
 
 		visit Prism::ConstantPathAndWriteNode do |node|
 			ConstantPathAndWriteNode.new(
+				prism_node: node,
 				target: visit(node.target),
 				value: visit(node.value),
 			)
 		end
 
 		visit Prism::ConstantPathNode do |node|
-			ConstantPath.new(
+			ConstantPathNode.new(
+				prism_node: node,
 				parent: visit(node.parent),
 				name: node.name,
 			)
@@ -281,6 +319,7 @@ module Refract
 
 		visit Prism::ConstantPathOperatorWriteNode do |node|
 			ConstantPathOperatorWriteNode.new(
+				prism_node: node,
 				target: visit(node.target),
 				value: visit(node.value),
 				binary_operator: node.binary_operator,
@@ -289,6 +328,7 @@ module Refract
 
 		visit Prism::ConstantPathOrWriteNode do |node|
 			ConstantPathOrWriteNode.new(
+				prism_node: node,
 				target: visit(node.target),
 				value: visit(node.value),
 			)
@@ -296,6 +336,7 @@ module Refract
 
 		visit Prism::ConstantPathTargetNode do |node|
 			ConstantPathTargetNode.new(
+				prism_node: node,
 				parent: visit(node.parent),
 				name: node.name,
 			)
@@ -303,6 +344,7 @@ module Refract
 
 		visit Prism::ConstantPathWriteNode do |node|
 			ConstantPathWriteNode.new(
+				prism_node: node,
 				target: visit(node.target),
 				value: visit(node.value),
 			)
@@ -310,18 +352,21 @@ module Refract
 
 		visit Prism::ConstantReadNode do |node|
 			ConstantReadNode.new(
-					name: node.name,
-				)
+				prism_node: node,
+				name: node.name,
+			)
 		end
 
 		visit Prism::ConstantTargetNode do |node|
 			ConstantTargetNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::ConstantWriteNode do |node|
 			ConstantWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -329,6 +374,7 @@ module Refract
 
 		visit Prism::DefNode do |node|
 			DefNode.new(
+				prism_node: node,
 				name: node.name,
 				receiver: visit(node.receiver),
 				parameters: visit(node.parameters),
@@ -338,40 +384,48 @@ module Refract
 
 		visit Prism::DefinedNode do |node|
 			DefinedNode.new(
+				prism_node: node,
 				value: visit(node.value),
 			)
 		end
 
 		visit Prism::ElseNode do |node|
 			ElseNode.new(
+				prism_node: node,
 				statements: visit(node.statements),
 			)
 		end
 
 		visit Prism::EmbeddedStatementsNode do |node|
 			EmbeddedStatementsNode.new(
+				prism_node: node,
 				statements: visit(node.statements),
 			)
 		end
 
 		visit Prism::EmbeddedVariableNode do |node|
 			EmbeddedVariableNode.new(
+				prism_node: node,
 				variable: visit(node.variable),
 			)
 		end
 
 		visit Prism::EnsureNode do |node|
 			EnsureNode.new(
+				prism_node: node,
 				statements: visit(node.statements),
 			)
 		end
 
 		visit Prism::FalseNode do |node|
-			FalseNode.new
+			FalseNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::FindPatternNode do |node|
 			FindPatternNode.new(
+				prism_node: node,
 				constant: visit(node.constant),
 				left: visit(node.left),
 				requireds: node.requireds.map { |n| visit(n) },
@@ -381,6 +435,7 @@ module Refract
 
 		visit Prism::FlipFlopNode do |node|
 			FlipFlopNode.new(
+				prism_node: node,
 				left: visit(node.left),
 				right: visit(node.right),
 				exclude_end: node.exclude_end?,
@@ -389,12 +444,14 @@ module Refract
 
 		visit Prism::FloatNode do |node|
 			FloatNode.new(
+				prism_node: node,
 				value: node.slice,
 			)
 		end
 
 		visit Prism::ForNode do |node|
 			ForNode.new(
+				prism_node: node,
 				index: visit(node.index),
 				collection: visit(node.collection),
 				statements: visit(node.statements),
@@ -402,21 +459,27 @@ module Refract
 		end
 
 		visit Prism::ForwardingArgumentsNode do |node|
-			ForwardingArgumentsNode.new
+			ForwardingArgumentsNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::ForwardingParameterNode do |node|
-			ForwardingParameterNode.new
+			ForwardingParameterNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::ForwardingSuperNode do |node|
 			ForwardingSuperNode.new(
+				prism_node: node,
 				block: visit(node.block),
 			)
 		end
 
 		visit Prism::GlobalVariableAndWriteNode do |node|
 			GlobalVariableAndWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -424,6 +487,7 @@ module Refract
 
 		visit Prism::GlobalVariableOperatorWriteNode do |node|
 			GlobalVariableOperatorWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 				binary_operator: node.binary_operator,
@@ -432,6 +496,7 @@ module Refract
 
 		visit Prism::GlobalVariableOrWriteNode do |node|
 			GlobalVariableOrWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -439,18 +504,21 @@ module Refract
 
 		visit Prism::GlobalVariableReadNode do |node|
 			GlobalVariableReadNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::GlobalVariableTargetNode do |node|
 			GlobalVariableTargetNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::GlobalVariableWriteNode do |node|
 			GlobalVariableWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -458,12 +526,14 @@ module Refract
 
 		visit Prism::HashNode do |node|
 			HashNode.new(
+				prism_node: node,
 				elements: node.elements&.map { |n| visit(n) },
 			)
 		end
 
 		visit Prism::HashPatternNode do |node|
 			HashPatternNode.new(
+				prism_node: node,
 				elements: node.elements&.map { |n| visit(n) },
 				rest: visit(node.rest),
 			)
@@ -471,30 +541,37 @@ module Refract
 
 		visit Prism::IfNode do |node|
 			IfNode.new(
+				prism_node: node,
 				predicate: visit(node.predicate),
 				statements: visit(node.statements),
 				subsequent: visit(node.subsequent),
+				inline: (node.predicate && node.statements && node.predicate.location.start_offset > node.statements.location.start_offset),
 			)
 		end
 
 		visit Prism::ImaginaryNode do |node|
 			ImaginaryNode.new(
+				prism_node: node,
 				numeric: visit(node.numeric),
 			)
 		end
 
 		visit Prism::ImplicitNode do |node|
 			ImplicitNode.new(
+				prism_node: node,
 				value: visit(node.value),
 			)
 		end
 
 		visit Prism::ImplicitRestNode do |node|
-			ImplicitRestNode.new
+			ImplicitRestNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::InNode do |node|
 			InNode.new(
+				prism_node: node,
 				pattern: visit(node.pattern),
 				statements: visit(node.statements),
 			)
@@ -502,6 +579,7 @@ module Refract
 
 		visit Prism::IndexAndWriteNode do |node|
 			IndexAndWriteNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				arguments: visit(node.arguments),
 				block: visit(node.block),
@@ -511,6 +589,7 @@ module Refract
 
 		visit Prism::IndexOperatorWriteNode do |node|
 			IndexOperatorWriteNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				arguments: visit(node.arguments),
 				block: visit(node.block),
@@ -521,6 +600,7 @@ module Refract
 
 		visit Prism::IndexOrWriteNode do |node|
 			IndexOrWriteNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				arguments: visit(node.arguments),
 				block: visit(node.block),
@@ -530,6 +610,7 @@ module Refract
 
 		visit Prism::IndexTargetNode do |node|
 			IndexTargetNode.new(
+				prism_node: node,
 				receiver: visit(node.receiver),
 				arguments: visit(node.arguments),
 				block: visit(node.block),
@@ -538,6 +619,7 @@ module Refract
 
 		visit Prism::InstanceVariableAndWriteNode do |node|
 			InstanceVariableAndWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -545,6 +627,7 @@ module Refract
 
 		visit Prism::InstanceVariableOperatorWriteNode do |node|
 			InstanceVariableOperatorWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 				binary_operator: node.binary_operator,
@@ -553,6 +636,7 @@ module Refract
 
 		visit Prism::InstanceVariableOrWriteNode do |node|
 			InstanceVariableOrWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -560,18 +644,21 @@ module Refract
 
 		visit Prism::InstanceVariableReadNode do |node|
 			InstanceVariableReadNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::InstanceVariableTargetNode do |node|
 			InstanceVariableTargetNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::InstanceVariableWriteNode do |node|
 			InstanceVariableWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -579,12 +666,14 @@ module Refract
 
 		visit Prism::IntegerNode do |node|
 			IntegerNode.new(
+				prism_node: node,
 				value: node.value,
 			)
 		end
 
 		visit Prism::InterpolatedMatchLastLineNode do |node|
 			InterpolatedMatchLastLineNode.new(
+				prism_node: node,
 				parts: node.parts&.map { |n| visit(n) },
 				ignore_case: node.ignore_case?,
 				multi_line: node.multi_line?,
@@ -595,6 +684,7 @@ module Refract
 
 		visit Prism::InterpolatedRegularExpressionNode do |node|
 			InterpolatedRegularExpressionNode.new(
+				prism_node: node,
 				parts: node.parts.map { |part| visit(part) },
 				ignore_case: node.ignore_case?,
 				multi_line: node.multi_line?,
@@ -605,44 +695,54 @@ module Refract
 
 		visit Prism::InterpolatedStringNode do |node|
 			InterpolatedStringNode.new(
+				prism_node: node,
 				parts: node.parts&.map { |n| visit(n) },
 			)
 		end
 
 		visit Prism::InterpolatedSymbolNode do |node|
 			InterpolatedSymbolNode.new(
+				prism_node: node,
 				parts: node.parts.map { |part| visit(part) },
 			)
 		end
 
 		visit Prism::InterpolatedXStringNode do |node|
 			InterpolatedXStringNode.new(
+				prism_node: node,
 				parts: node.parts.map { |part| visit(part) },
 			)
 		end
 
 		visit Prism::ItLocalVariableReadNode do |node|
-			ItLocalVariableReadNode.new
+			ItLocalVariableReadNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::ItParametersNode do |node|
-			ItParametersNode.new
+			ItParametersNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::KeywordHashNode do |node|
 			KeywordHashNode.new(
+				prism_node: node,
 				elements: node.elements&.map { |n| visit(n) },
 			)
 		end
 
 		visit Prism::KeywordRestParameterNode do |node|
 			KeywordRestParameterNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::LambdaNode do |node|
 			LambdaNode.new(
+				prism_node: node,
 				parameters: visit(node.parameters),
 				body: visit(node.body),
 			)
@@ -650,6 +750,7 @@ module Refract
 
 		visit Prism::LocalVariableAndWriteNode do |node|
 			LocalVariableAndWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 				depth: node.depth,
@@ -658,6 +759,7 @@ module Refract
 
 		visit Prism::LocalVariableOperatorWriteNode do |node|
 			LocalVariableOperatorWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 				binary_operator: node.binary_operator,
@@ -667,6 +769,7 @@ module Refract
 
 		visit Prism::LocalVariableOrWriteNode do |node|
 			LocalVariableOrWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 				depth: node.depth,
@@ -675,18 +778,21 @@ module Refract
 
 		visit Prism::LocalVariableReadNode do |node|
 			LocalVariableReadNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::LocalVariableTargetNode do |node|
 			LocalVariableTargetNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::LocalVariableWriteNode do |node|
 			LocalVariableWriteNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -694,6 +800,7 @@ module Refract
 
 		visit Prism::MatchLastLineNode do |node|
 			MatchLastLineNode.new(
+				prism_node: node,
 				unescaped: node.unescaped,
 				ignore_case: node.ignore_case?,
 				multi_line: node.multi_line?,
@@ -704,6 +811,7 @@ module Refract
 
 		visit Prism::MatchPredicateNode do |node|
 			MatchPredicateNode.new(
+				prism_node: node,
 				value: visit(node.value),
 				pattern: visit(node.pattern),
 			)
@@ -711,6 +819,7 @@ module Refract
 
 		visit Prism::MatchRequiredNode do |node|
 			MatchRequiredNode.new(
+				prism_node: node,
 				value: visit(node.value),
 				pattern: visit(node.pattern),
 			)
@@ -718,17 +827,21 @@ module Refract
 
 		visit Prism::MatchWriteNode do |node|
 			MatchWriteNode.new(
+				prism_node: node,
 				call: visit(node.call),
 				targets: node.targets.map { |t| visit(t) },
 			)
 		end
 
 		visit Prism::MissingNode do |node|
-			MissingNode.new
+			MissingNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::ModuleNode do |node|
 			ModuleNode.new(
+				prism_node: node,
 				constant_path: visit(node.constant_path),
 				body: visit(node.body),
 			)
@@ -736,6 +849,7 @@ module Refract
 
 		visit Prism::MultiTargetNode do |node|
 			MultiTargetNode.new(
+				prism_node: node,
 				lefts: node.lefts.map { |n| visit(n) },
 				rest: visit(node.rest),
 				rights: node.rights.map { |n| visit(n) },
@@ -744,6 +858,7 @@ module Refract
 
 		visit Prism::MultiWriteNode do |node|
 			MultiWriteNode.new(
+				prism_node: node,
 				lefts: node.lefts&.map { |n| visit(n) },
 				rest: visit(node.rest),
 				rights: node.rights&.map { |n| visit(n) },
@@ -753,30 +868,39 @@ module Refract
 
 		visit Prism::NextNode do |node|
 			NextNode.new(
+				prism_node: node,
 				arguments: visit(node.arguments),
 			)
 		end
 
 		visit Prism::NilNode do |node|
-			NilNode.new
+			NilNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::NoKeywordsParameterNode do |node|
-			NoKeywordsParameterNode.new
+			NoKeywordsParameterNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::NumberedParametersNode do |node|
-			NumberedParametersNode.new
+			NumberedParametersNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::NumberedReferenceReadNode do |node|
 			NumberedReferenceReadNode.new(
+				prism_node: node,
 				number: node.number,
 			)
 		end
 
 		visit Prism::OptionalKeywordParameterNode do |node|
 			OptionalKeywordParameterNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -784,6 +908,7 @@ module Refract
 
 		visit Prism::OptionalParameterNode do |node|
 			OptionalParameterNode.new(
+				prism_node: node,
 				name: node.name,
 				value: visit(node.value),
 			)
@@ -791,14 +916,16 @@ module Refract
 
 		visit Prism::OrNode do |node|
 			OrNode.new(
+				prism_node: node,
 				left: visit(node.left),
-				operator: node.operator_loc.slice,
+				operator: node.operator,
 				right: visit(node.right),
 			)
 		end
 
 		visit Prism::ParametersNode do |node|
 			ParametersNode.new(
+				prism_node: node,
 				requireds: node.requireds&.map { |n| visit(n) },
 				optionals: node.optionals&.map { |n| visit(n) },
 				rest: visit(node.rest),
@@ -811,42 +938,49 @@ module Refract
 
 		visit Prism::ParenthesesNode do |node|
 			ParenthesesNode.new(
+				prism_node: node,
 				body: visit(node.body),
 			)
 		end
 
 		visit Prism::PinnedExpressionNode do |node|
 			PinnedExpressionNode.new(
+				prism_node: node,
 				expression: visit(node.expression),
 			)
 		end
 
 		visit Prism::PinnedVariableNode do |node|
 			PinnedVariableNode.new(
+				prism_node: node,
 				variable: visit(node.variable),
 			)
 		end
 
 		visit Prism::PostExecutionNode do |node|
 			PostExecutionNode.new(
+				prism_node: node,
 				statements: visit(node.statements),
 			)
 		end
 
 		visit Prism::PreExecutionNode do |node|
 			PreExecutionNode.new(
+				prism_node: node,
 				statements: visit(node.statements),
 			)
 		end
 
 		visit Prism::ProgramNode do |node|
 			ProgramNode.new(
+				prism_node: node,
 				statements: visit(node.statements),
 			)
 		end
 
 		visit Prism::RangeNode do |node|
 			RangeNode.new(
+				prism_node: node,
 				left: visit(node.left),
 				right: visit(node.right),
 				exclude_end: node.exclude_end?,
@@ -855,17 +989,21 @@ module Refract
 
 		visit Prism::RationalNode do |node|
 			RationalNode.new(
+				prism_node: node,
 				numerator: node.numerator,
 				denominator: node.denominator,
 			)
 		end
 
 		visit Prism::RedoNode do |node|
-			RedoNode.new
+			RedoNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::RegularExpressionNode do |node|
 			RegularExpressionNode.new(
+				prism_node: node,
 				unescaped: node.unescaped,
 				ignore_case: node.ignore_case?,
 				multi_line: node.multi_line?,
@@ -876,18 +1014,21 @@ module Refract
 
 		visit Prism::RequiredKeywordParameterNode do |node|
 			RequiredKeywordParameterNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::RequiredParameterNode do |node|
 			RequiredParameterNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::RescueModifierNode do |node|
 			RescueModifierNode.new(
+				prism_node: node,
 				expression: visit(node.expression),
 				rescue_expression: visit(node.rescue_expression),
 			)
@@ -895,6 +1036,7 @@ module Refract
 
 		visit Prism::RescueNode do |node|
 			RescueNode.new(
+				prism_node: node,
 				exceptions: node.exceptions&.map { |n| visit(n) },
 				reference: visit(node.reference),
 				statements: visit(node.statements),
@@ -904,69 +1046,87 @@ module Refract
 
 		visit Prism::RestParameterNode do |node|
 			RestParameterNode.new(
+				prism_node: node,
 				name: node.name,
 			)
 		end
 
 		visit Prism::RetryNode do |node|
-			RetryNode.new
+			RetryNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::ReturnNode do |node|
 			ReturnNode.new(
+				prism_node: node,
 				arguments: visit(node.arguments),
 			)
 		end
 
 		visit Prism::SelfNode do |node|
-			SelfNode.new
+			SelfNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::ShareableConstantNode do |node|
 			ShareableConstantNode.new(
+				prism_node: node,
 				write: visit(node.write),
 			)
 		end
 
 		visit Prism::SingletonClassNode do |node|
 			SingletonClassNode.new(
+				prism_node: node,
 				expression: visit(node.expression),
 				body: visit(node.body),
 			)
 		end
 
 		visit Prism::SourceEncodingNode do |node|
-			SourceEncodingNode.new
+			SourceEncodingNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::SourceFileNode do |node|
-			SourceFileNode.new
+			SourceFileNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::SourceLineNode do |node|
-			SourceLineNode.new
+			SourceLineNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::SplatNode do |node|
 			SplatNode.new(
+				prism_node: node,
 				expression: visit(node.expression),
 			)
 		end
 
 		visit Prism::StatementsNode do |node|
 			StatementsNode.new(
+				prism_node: node,
 				body: node.body&.map { |n| visit(n) },
 			)
 		end
 
 		visit Prism::StringNode do |node|
 			StringNode.new(
+				prism_node: node,
 				unescaped: node.unescaped,
 			)
 		end
 
 		visit Prism::SuperNode do |node|
 			SuperNode.new(
+				prism_node: node,
 				arguments: visit(node.arguments),
 				block: visit(node.block),
 			)
@@ -974,37 +1134,47 @@ module Refract
 
 		visit Prism::SymbolNode do |node|
 			SymbolNode.new(
+				prism_node: node,
 				unescaped: node.unescaped,
+				quoted: node.opening_loc && node.closing_loc,
 			)
 		end
 
 		visit Prism::TrueNode do |node|
-			TrueNode.new
+			TrueNode.new(
+				prism_node: node,
+			)
 		end
 
 		visit Prism::UndefNode do |node|
 			UndefNode.new(
+				prism_node: node,
 				names: node.names.map { |n| visit(n) },
 			)
 		end
 
 		visit Prism::UnlessNode do |node|
 			UnlessNode.new(
+				prism_node: node,
 				predicate: visit(node.predicate),
 				statements: visit(node.statements),
 				else_clause: visit(node.else_clause),
+				inline: (node.predicate && node.statements && node.predicate.location.start_offset > node.statements.location.start_offset),
 			)
 		end
 
 		visit Prism::UntilNode do |node|
 			UntilNode.new(
+				prism_node: node,
 				predicate: visit(node.predicate),
 				statements: visit(node.statements),
+				inline: (node.predicate && node.statements && node.predicate.location.start_offset > node.statements.location.start_offset),
 			)
 		end
 
 		visit Prism::WhenNode do |node|
 			WhenNode.new(
+				prism_node: node,
 				conditions: node.conditions&.map { |n| visit(n) },
 				statements: visit(node.statements),
 			)
@@ -1012,19 +1182,23 @@ module Refract
 
 		visit Prism::WhileNode do |node|
 			WhileNode.new(
+				prism_node: node,
 				predicate: visit(node.predicate),
 				statements: visit(node.statements),
+				inline: (node.predicate && node.statements && node.predicate.location.start_offset > node.statements.location.start_offset),
 			)
 		end
 
 		visit Prism::XStringNode do |node|
 			XStringNode.new(
+				prism_node: node,
 				unescaped: node.unescaped,
 			)
 		end
 
 		visit Prism::YieldNode do |node|
 			YieldNode.new(
+				prism_node: node,
 				arguments: visit(node.arguments),
 			)
 		end