Combine Elsif node into IfNode

Many other Ruby ASTs do not have a separate node representing `elsif`
conditionals; instead, they use the same node as `if` but make it a
consequent of other `if` nodes. This commit removes the `Elsif` node and
combines its functionality with `IfNode`, ensuring that both the parsing and
formatting logic are still functional.

Author: egiurleo

lib/syntax_tree/node.rb

@@ -800,7 +800,7 @@ def trailing_comma?
         # after it without resulting in a syntax error.
         false
       elsif (parts.length == 1) && (part = parts.first) &&
-            (part.is_a?(Command) || part.is_a?(CommandCall))
+              (part.is_a?(Command) || part.is_a?(CommandCall))
         # If the only argument is a command or command call, then a trailing
         # comma would be parsed as part of that expression instead of on this
         # one, so we don't want to add a trailing comma.
@@ -4804,95 +4804,6 @@ def ===(other)
     end
   end
 
-  # Elsif represents another clause in an +if+ or +unless+ chain.
-  #
-  #     if variable
-  #     elsif other_variable
-  #     end
-  #
-  class Elsif < Node
-    # [Node] the expression to be checked
-    attr_reader :predicate
-
-    # [Statements] the expressions to be executed
-    attr_reader :statements
-
-    # [nil | Elsif | Else] the next clause in the chain
-    attr_reader :consequent
-
-    # [Array[ Comment | EmbDoc ]] the comments attached to this node
-    attr_reader :comments
-
-    def initialize(predicate:, statements:, consequent:, location:)
-      @predicate = predicate
-      @statements = statements
-      @consequent = consequent
-      @location = location
-      @comments = []
-    end
-
-    def accept(visitor)
-      visitor.visit_elsif(self)
-    end
-
-    def child_nodes
-      [predicate, statements, consequent]
-    end
-
-    def copy(predicate: nil, statements: nil, consequent: nil, location: nil)
-      node =
-        Elsif.new(
-          predicate: predicate || self.predicate,
-          statements: statements || self.statements,
-          consequent: consequent || self.consequent,
-          location: location || self.location
-        )
-
-      node.comments.concat(comments.map(&:copy))
-      node
-    end
-
-    alias deconstruct child_nodes
-
-    def deconstruct_keys(_keys)
-      {
-        predicate: predicate,
-        statements: statements,
-        consequent: consequent,
-        location: location,
-        comments: comments
-      }
-    end
-
-    def format(q)
-      q.group do
-        q.group do
-          q.text("elsif ")
-          q.nest("elsif".length - 1) { q.format(predicate) }
-        end
-
-        unless statements.empty?
-          q.indent do
-            q.breakable_force
-            q.format(statements)
-          end
-        end
-
-        if consequent
-          q.group do
-            q.breakable_force
-            q.format(consequent)
-          end
-        end
-      end
-    end
-
-    def ===(other)
-      other.is_a?(Elsif) && predicate === other.predicate &&
-        statements === other.statements && consequent === other.consequent
-    end
-  end
-
   # EmbDoc represents a multi-line comment.
   #
   #     =begin
@@ -6288,7 +6199,7 @@ def format(q)
         # If we can transform this node into a ternary, then we're going to
         # print a special version that uses the ternary operator if it fits on
         # one line.
-        if Ternaryable.call(q, node)
+        if Ternaryable.call(q, node) && keyword != "elsif"
           format_ternary(q)
           return
         end
@@ -6297,7 +6208,7 @@ def format(q)
         # case we can't know for certain that that assignment doesn't impact the
         # statements inside the conditional) then we can't use the modifier form
         # and we must use the block form.
-        if ContainsAssignment.call(node.predicate)
+        if keyword == "elsif" || ContainsAssignment.call(node.predicate)
           format_break(q, force: true)
           return
         end
@@ -6346,8 +6257,10 @@ def format_break(q, force:)
         q.format(node.consequent)
       end
 
-      force ? q.breakable_force : q.breakable_space
-      q.text("end")
+      unless keyword == "elsif"
+        force ? q.breakable_force : q.breakable_space
+        q.text("end")
+      end
     end
 
     def format_ternary(q)
@@ -6408,7 +6321,7 @@ def contains_conditional?
     end
   end
 
-  # If represents the first clause in an +if+ chain.
+  # If an +if+ or +elsif+ clause in an +if+ chain.
   #
   #     if predicate
   #     end
@@ -6420,17 +6333,21 @@ class IfNode < Node
     # [Statements] the expressions to be executed
     attr_reader :statements
 
-    # [nil | Elsif | Else] the next clause in the chain
+    # [nil | IfNode | Else] the next clause in the chain
     attr_reader :consequent
 
     # [Array[ Comment | EmbDoc ]] the comments attached to this node
     attr_reader :comments
 
-    def initialize(predicate:, statements:, consequent:, location:)
+    # [ String ] the opening of the conditional statement
+    attr_reader :beginning
+
+    def initialize(predicate:, statements:, consequent:, location:, beginning:)
       @predicate = predicate
       @statements = statements
       @consequent = consequent
       @location = location
+      @beginning = beginning
       @comments = []
     end
 
@@ -6442,13 +6359,20 @@ def child_nodes
       [predicate, statements, consequent]
     end
 
-    def copy(predicate: nil, statements: nil, consequent: nil, location: nil)
+    def copy(
+      predicate: nil,
+      statements: nil,
+      consequent: nil,
+      location: nil,
+      beginning: nil
+    )
       node =
         IfNode.new(
           predicate: predicate || self.predicate,
           statements: statements || self.statements,
           consequent: consequent || self.consequent,
-          location: location || self.location
+          location: location || self.location,
+          beginning: beginning || self.beginning
         )
 
       node.comments.concat(comments.map(&:copy))
@@ -6463,17 +6387,19 @@ def deconstruct_keys(_keys)
         statements: statements,
         consequent: consequent,
         location: location,
+        beginning: beginning,
         comments: comments
       }
     end
 
     def format(q)
-      ConditionalFormatter.new("if", self).format(q)
+      ConditionalFormatter.new(beginning, self).format(q)
     end
 
     def ===(other)
       other.is_a?(IfNode) && predicate === other.predicate &&
-        statements === other.statements && consequent === other.consequent
+        statements === other.statements && consequent === other.consequent &&
+        beginning === other.beginning
     end
 
     # Checks if the node was originally found in the modifier form.
@@ -9929,7 +9855,7 @@ def format(q)
           q.breakable_force
           q.format(statement)
         elsif (statement.is_a?(VCall) && statement.access_control?) ||
-              (previous.is_a?(VCall) && previous.access_control?)
+                (previous.is_a?(VCall) && previous.access_control?)
           q.breakable_force
           q.breakable_force
           q.format(statement)
@@ -11264,7 +11190,7 @@ class UnlessNode < Node
     # [Statements] the expressions to be executed
     attr_reader :statements
 
-    # [nil | Elsif | Else] the next clause in the chain
+    # [nil | IfNode | Else] the next clause in the chain
     attr_reader :consequent
 
     # [Array[ Comment | EmbDoc ]] the comments attached to this node

lib/syntax_tree/parser.rb

@@ -1566,11 +1566,12 @@ def on_elsif(predicate, statements, consequent)
         ending.location.start_column
       )
 
-      Elsif.new(
+      IfNode.new(
         predicate: predicate,
         statements: statements,
         consequent: consequent,
-        location: beginning.location.to(ending.location)
+        location: beginning.location.to(ending.location),
+        beginning: beginning.value
       )
     end
 
@@ -2055,7 +2056,8 @@ def on_if(predicate, statements, consequent)
         predicate: predicate,
         statements: statements,
         consequent: consequent,
-        location: beginning.location.to(ending.location)
+        location: beginning.location.to(ending.location),
+        beginning: beginning.value
       )
     end
 
@@ -2073,14 +2075,15 @@ def on_ifop(predicate, truthy, falsy)
     # :call-seq:
     #   on_if_mod: (untyped predicate, untyped statement) -> IfNode
     def on_if_mod(predicate, statement)
-      consume_keyword(:if)
+      beginning = consume_keyword(:if)
 
       IfNode.new(
         predicate: predicate,
         statements:
           Statements.new(body: [statement], location: statement.location),
         consequent: nil,
-        location: statement.location.to(predicate.location)
+        location: statement.location.to(predicate.location),
+        beginning: beginning.value
       )
     end
 

test/node_test.rb

@@ -452,7 +452,7 @@ def test_elsif
       SOURCE
 
       at = location(lines: 2..4, chars: 9..30)
-      assert_node(Elsif, source, at: at, &:consequent)
+      assert_node(IfNode, source, at: at, &:consequent)
     end
 
     def test_embdoc