Use RescueNode#resbody_branches

marcandre · Sep 17, 2020 · aa7d8d4 · aa7d8d4
1 parent 001ddc1
commit aa7d8d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb b/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb
@@ -91,9 +91,7 @@ def on_case(node)
         end
 
         def on_rescue(node)
-          _body, *resbodies, _else = *node
-
-          resbodies.each do |resbody|
+          node.resbody_branches.each do |resbody|
             rescued_exceptions = resbody.exceptions
             next if !multiline_rescue_exceptions?(rescued_exceptions) ||
                     next_line_empty?(rescued_exceptions.last.last_line)

diff --git a/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb b/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb
@@ -113,10 +113,9 @@ def keyword_locations(node)
         end
 
         def keyword_locations_in_rescue(node)
-          _begin_body, *resbodies, _else_body = *node
           [
             node.loc.else,
-            *resbodies.map { |body| body.loc.keyword }
+            *node.resbody_branches.map { |body| body.loc.keyword }
           ].compact
         end
 

diff --git a/lib/rubocop/cop/lint/duplicate_rescue_exception.rb b/lib/rubocop/cop/lint/duplicate_rescue_exception.rb
@@ -33,9 +33,7 @@ class DuplicateRescueException < Base
         def on_rescue(node)
           return if rescue_modifier?(node)
 
-          _body, *resbodies, _else = *node
-
-          resbodies.each_with_object(Set.new) do |resbody, previous|
+          node.resbody_branches.each_with_object(Set.new) do |resbody, previous|
             rescued_exceptions = resbody.exceptions
 
             rescued_exceptions.each do |exception|