Fix up call chaining with new folded nodes

Author: kddnewton

lib/syntax_tree/node.rb

@@ -359,7 +359,8 @@ class Alias < Node
     # Formats an argument to the alias keyword. For symbol literals it uses the
     # value of the symbol directly to look like bare words.
     class AliasArgumentFormatter
-      # [Backref | DynaSymbol | GVar | SymbolLiteral] the argument being passed to alias
+      # [Backref | DynaSymbol | GVar | SymbolLiteral] the argument being passed
+      # to alias
       attr_reader :argument
 
       def initialize(argument)
@@ -2245,14 +2246,26 @@ def format(q)
         when Call
           case (receiver = child.receiver)
           when Call
-            children << receiver
+            if receiver.receiver.nil?
+              break
+            else
+              children << receiver
+            end
           when MethodAddBlock
-            receiver.call.is_a?(Call) ? children << receiver : break
+            if receiver.call.is_a?(Call) && !receiver.call.receiver.nil?
+              children << receiver
+            else
+              break
+            end
           else
             break
           end
         when MethodAddBlock
-          child.call.is_a?(Call) ? children << child.call : break
+          if child.call.is_a?(Call) && !child.call.receiver.nil?
+            children << child.call
+          else
+            break
+          end
         else
           break
         end
@@ -2271,7 +2284,8 @@ def format(q)
         # of just Statements nodes.
         parent = parents[3] if parent.is_a?(Block) && parent.keywords?
 
-        if parent.is_a?(MethodAddBlock) && parent.call.is_a?(Call) && parent.call.message.value == "sig"
+        if parent.is_a?(MethodAddBlock) && parent.call.is_a?(Call) &&
+             parent.call.message.value == "sig"
           threshold = 2
         end
       end
@@ -2300,7 +2314,7 @@ def format_chain(q, children)
       # formatter so it's as if we had descending normally into them. This is
       # necessary so they can check their parents as normal.
       q.stack.concat(children)
-      q.format(children.last.receiver)
+      q.format(children.last.receiver) if children.last.receiver
 
       q.group do
         if attach_directly?(children.last)
@@ -2343,7 +2357,8 @@ def format_chain(q, children)
             # If the parent call node has a comment on the message then we need
             # to print the operator trailing in order to keep it working.
             last_child = children.last
-            if last_child.is_a?(Call) && last_child.message.comments.any?
+            if last_child.is_a?(Call) && last_child.message.comments.any? &&
+                 last_child.operator
               q.format(CallOperatorFormatter.new(last_child.operator))
               skip_operator = true
             else
@@ -2372,9 +2387,9 @@ def self.chained?(node)
 
       case node
       when Call
-        true
+        !node.receiver.nil?
       when MethodAddBlock
-        node.call.is_a?(Call)
+        node.call.is_a?(Call) && !node.call.receiver.nil?
       else
         false
       end
@@ -2405,7 +2420,7 @@ def format_child(
       case child
       when Call
         q.group do
-          unless skip_operator
+          if !skip_operator && child.operator
             q.format(CallOperatorFormatter.new(child.operator))
           end
           q.format(child.message) if child.message != :call
@@ -2495,7 +2510,8 @@ def format(q)
         # If we're at the top of a call chain, then we're going to do some
         # specialized printing in case we can print it nicely. We _only_ do this
         # at the top of the chain to avoid weird recursion issues.
-        if CallChainFormatter.chained?(receiver) && !CallChainFormatter.chained?(q.parent)
+        if CallChainFormatter.chained?(receiver) &&
+             !CallChainFormatter.chained?(q.parent)
           q.group do
             q
               .if_break { CallChainFormatter.new(self).format(q) }
@@ -2507,11 +2523,13 @@ def format(q)
       else
         q.format(message)
 
-        if arguments.is_a?(ArgParen) && arguments.arguments.nil? && !message.is_a?(Const)
-          # If you're using an explicit set of parentheses on something that looks
-          # like a constant, then we need to match that in order to maintain valid
-          # Ruby. For example, you could do something like Foo(), on which we
-          # would need to keep the parentheses to make it look like a method call.
+        if arguments.is_a?(ArgParen) && arguments.arguments.nil? &&
+             !message.is_a?(Const)
+          # If you're using an explicit set of parentheses on something that
+          # looks like a constant, then we need to match that in order to
+          # maintain valid Ruby. For example, you could do something like Foo(),
+          # on which we would need to keep the parentheses to make it look like
+          # a method call.
         else
           q.format(arguments)
         end
@@ -3726,7 +3744,13 @@ def child_nodes
     alias deconstruct child_nodes
 
     def deconstruct_keys(_keys)
-      { left: left, operator: operator, right: right, location: location, comments: comments }
+      {
+        left: left,
+        operator: operator,
+        right: right,
+        location: location,
+        comments: comments
+      }
     end
 
     def format(q)
@@ -5133,7 +5157,11 @@ def format(q)
         if ContainsAssignment.call(statement) || q.parent.is_a?(In)
           q.group { format_flat(q) }
         else
-          q.group { q.if_break { format_break(q, force: false) }.if_flat { format_flat(q) } }
+          q.group do
+            q
+              .if_break { format_break(q, force: false) }
+              .if_flat { format_flat(q) }
+          end
         end
       else
         # If we can transform this node into a ternary, then we're going to
@@ -9063,7 +9091,8 @@ def format(q)
       #
       #     foo = bar while foo
       #
-      if node.modifier? && (statement = node.statements.body.first) && (statement.is_a?(Begin) || ContainsAssignment.call(statement))
+      if node.modifier? && (statement = node.statements.body.first) &&
+           (statement.is_a?(Begin) || ContainsAssignment.call(statement))
         q.format(statement)
         q.text(" #{keyword} ")
         q.format(node.predicate)
@@ -9466,9 +9495,7 @@ def format(q)
             # last argument to the predicate is and endless range, then you are
             # forced to use the "then" keyword to make it parse properly.
             last = arguments.parts.last
-            if last.is_a?(RangeLiteral) && !last.right
-              q.text(" then")
-            end
+            q.text(" then") if last.is_a?(RangeLiteral) && !last.right
           end
         end
 

lib/syntax_tree/parser.rb

@@ -1616,7 +1616,13 @@ def on_excessed_comma(*)
     # :call-seq:
     #   on_fcall: ((Const | Ident) value) -> Call
     def on_fcall(value)
-      Call.new(receiver: nil, operator: nil, message: value, arguments: nil, location: value.location)
+      Call.new(
+        receiver: nil,
+        operator: nil,
+        message: value,
+        arguments: nil,
+        location: value.location
+      )
     end
 
     # :call-seq:
@@ -1923,7 +1929,8 @@ def on_if_mod(predicate, statement)
 
       If.new(
         predicate: predicate,
-        statements: Statements.new(self, body: [statement], location: statement.location),
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
         consequent: nil,
         location: statement.location.to(predicate.location)
       )
@@ -2209,7 +2216,8 @@ def lambda_locals(source)
           on_comma: :item,
           on_rparen: :final
         },
-        final: {}
+        final: {
+        }
       }
 
       tokens[(index + 1)..].each_with_object([]) do |token, locals|
@@ -3622,7 +3630,8 @@ def on_unless_mod(predicate, statement)
 
       Unless.new(
         predicate: predicate,
-        statements: Statements.new(self, body: [statement], location: statement.location),
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
         consequent: nil,
         location: statement.location.to(predicate.location)
       )
@@ -3665,7 +3674,8 @@ def on_until_mod(predicate, statement)
 
       Until.new(
         predicate: predicate,
-        statements: Statements.new(self, body: [statement], location: statement.location),
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
         location: statement.location.to(predicate.location)
       )
     end
@@ -3791,7 +3801,8 @@ def on_while_mod(predicate, statement)
 
       While.new(
         predicate: predicate,
-        statements: Statements.new(self, body: [statement], location: statement.location),
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
         location: statement.location.to(predicate.location)
       )
     end

lib/syntax_tree/visitor/field_visitor.rb

@@ -779,9 +779,7 @@ def visit_rest_param(node)
       end
 
       def visit_retry(node)
-        node(node, "retry") do
-          comments(node)
-        end
+        node(node, "retry") { comments(node) }
       end
 
       def visit_return(node)
@@ -1021,9 +1019,7 @@ def visit_yield(node)
       end
 
       def visit_zsuper(node)
-        node(node, "zsuper") do
-          comments(node)
-        end
+        node(node, "zsuper") { comments(node) }
       end
 
       def visit___end__(node)