Move block down to the command node

Author: kddnewton

CHANGELOG.md

@@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
   - `DoBlock` and `BraceBlock` have now been folded into a `Block` node. The `Block` node now has a `keywords?` method on it that returns true if the block was constructed with the `do`..`end` keywords. The `visit_do_block` and `visit_brace_block` methods on the visitor have therefore been removed and replaced with the `visit_block` method.
   - `Return0` is no longer a node. Instead if has been folded into the `Return` node. The `Return` node can now have its `arguments` field be `nil`. Consequently, the `visit_return0` method has been removed from the visitor interface. If you were previously using this method, you should now use `visit_return` instead.
 - The `ArgsForward`, `Redo`, `Retry`, and `ZSuper` nodes no longer have `value` fields associated with them (which were always string literals corresponding to the keyword being used).
-- `CommandCall` now has a `block` attribute on it. This attribute is used in the place where you would previously have a `MethodAddBlock` structure. Where before the `MethodAddBlock` would have the `CommandCall` and `Block` as its two children, you now just have one `CommandCall` node with the `block` attribute set to the `Block` node.
+- The `Command` and `CommandCall` nodes now has `block` attributes on them. These attributes are used in the place where you would previously have had a `MethodAddBlock` structure. Where before the `MethodAddBlock` would have the command and block as its two children, you now just have one command node with the `block` attribute set to the `Block` node.
 
 ## [4.3.0] - 2022-10-28
 

lib/syntax_tree/node.rb

@@ -2847,12 +2847,16 @@ class Command < Node
     # [Args] the arguments being sent with the message
     attr_reader :arguments
 
+    # [nil | Block] the optional block being passed to the method
+    attr_reader :block
+
     # [Array[ Comment | EmbDoc ]] the comments attached to this node
     attr_reader :comments
 
-    def initialize(message:, arguments:, location:)
+    def initialize(message:, arguments:, block:, location:)
       @message = message
       @arguments = arguments
+      @block = block
       @location = location
       @comments = []
     end
@@ -2862,7 +2866,7 @@ def accept(visitor)
     end
 
     def child_nodes
-      [message, arguments]
+      [message, arguments, block]
     end
 
     alias deconstruct child_nodes
@@ -2871,6 +2875,7 @@ def deconstruct_keys(_keys)
       {
         message: message,
         arguments: arguments,
+        block: block,
         location: location,
         comments: comments
       }
@@ -2881,6 +2886,8 @@ def format(q)
         q.format(message)
         align(q, self) { q.format(arguments) }
       end
+
+      q.format(block) if block
     end
 
     private
@@ -2965,7 +2972,7 @@ def accept(visitor)
     end
 
     def child_nodes
-      [receiver, message, arguments]
+      [receiver, message, arguments, block]
     end
 
     alias deconstruct child_nodes
@@ -3567,8 +3574,8 @@ def format(q)
       # If the receiver of this block a Command or CommandCall node, then there
       # are no parentheses around the arguments to that command, so we need to
       # break the block.
-      parent = q.parent
-      if (parent.is_a?(MethodAddBlock) && parent.call.is_a?(Command)) || parent.is_a?(CommandCall)
+      case q.parent
+      when Command, CommandCall
         q.break_parent
         format_break(q, break_opening, break_closing)
         return

lib/syntax_tree/parser.rb

@@ -1076,6 +1076,7 @@ def on_command(message, arguments)
       Command.new(
         message: message,
         arguments: arguments,
+        block: nil,
         location: message.location.to(arguments.location)
       )
     end
@@ -2333,6 +2334,17 @@ def on_method_add_arg(call, arguments)
     #   ) -> MethodAddBlock
     def on_method_add_block(call, block)
       case call
+      when Command
+        node =
+          Command.new(
+            message: call.message,
+            arguments: call.arguments,
+            block: block,
+            location: call.location.to(block.location)
+          )
+
+        node.comments.concat(call.comments)
+        node
       when CommandCall
         node =
           CommandCall.new(