Ensure all nodes that could have heredocs nested know about their end lines.

Author: kddnewton

CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Allow arrays of `CHAR` nodes to be converted to `QWords` under certain conditions.
 - Allow `Hash` opening braces to have trailing comments.
 - Add parentheses if `Yield` breaks onto multiple lines.
+- Ensure all nodes that could have heredocs nested know about their end lines.
 
 ### Changed
 

lib/syntax_tree.rb

@@ -75,7 +75,7 @@ def to(other)
       Location.new(
         start_line: start_line,
         start_char: start_char,
-        end_line: other.end_line,
+        end_line: [end_line, other.end_line].max,
         end_char: other.end_char
       )
     end
@@ -3146,13 +3146,7 @@ def on_call(receiver, operator, message)
       receiver: receiver,
       operator: operator,
       message: message,
-      location:
-        Location.new(
-          start_line: receiver.location.start_line,
-          start_char: receiver.location.start_char,
-          end_line: [ending.location.end_line, receiver.location.end_line].max,
-          end_char: ending.location.end_char
-        )
+      location: receiver.location.to(ending.location)
     )
   end
 
@@ -3588,13 +3582,7 @@ def on_command(message, arguments)
     Command.new(
       message: message,
       arguments: arguments,
-      location:
-        Location.new(
-          start_line: message.location.start_line,
-          start_char: message.location.start_char,
-          end_line: [message.location.end_line, arguments.location.end_line].max,
-          end_char: arguments.location.end_char
-        )
+      location: message.location.to(arguments.location)
     )
   end
 
@@ -3741,13 +3729,7 @@ def on_command_call(receiver, operator, message, arguments)
       operator: operator,
       message: message,
       arguments: arguments,
-      location:
-        Location.new(
-          start_line: receiver.location.start_line,
-          start_char: receiver.location.start_char,
-          end_line: [receiver.location.end_line, ending.location.end_line].max,
-          end_char: ending.location.end_char
-        )
+      location: receiver.location.to(ending.location)
     )
   end
 
@@ -7001,13 +6983,7 @@ def on_if_mod(predicate, statement)
     IfMod.new(
       statement: statement,
       predicate: predicate,
-      location:
-        Location.new(
-          start_line: statement.location.start_line,
-          start_char: statement.location.start_char,
-          end_line: [statement.location.end_line, predicate.location.end_line].max,
-          end_char: predicate.location.end_char
-        )
+      location: statement.location.to(predicate.location)
     )
   end
 
@@ -12159,13 +12135,7 @@ def on_unless_mod(predicate, statement)
     UnlessMod.new(
       statement: statement,
       predicate: predicate,
-      location:
-        Location.new(
-          start_line: statement.location.start_line,
-          start_char: statement.location.start_char,
-          end_line: [statement.location.end_line, predicate.location.end_line].max,
-          end_char: predicate.location.end_char
-        )
+      location: statement.location.to(predicate.location)
     )
   end