lib/rubocop/cop/rails/transaction_exit_statement.rb in rubocop-rails-2.14.1 vs lib/rubocop/cop/rails/transaction_exit_statement.rb in rubocop-rails-2.14.2

@@ -52,25 +52,42 @@
         def_node_search :exit_statements, <<~PATTERN
           ({return | break | send nil? :throw} ...)
         PATTERN
 
         def on_send(node)
-          parent = node.parent
+          return unless (parent = node.parent)
+          return unless parent.block_type? && parent.body
 
-          return unless parent&.block_type?
-
           exit_statements(parent.body).each do |statement_node|
-            statement = if statement_node.return_type?
-                          'return'
-                        elsif statement_node.break_type?
-                          'break'
-                        else
-                          statement_node.method_name
-                        end
+            next if in_rescue?(statement_node) || nested_block?(statement_node)
+
+            statement = statement(statement_node)
             message = format(MSG, statement: statement)
 
             add_offense(statement_node, message: message)
           end
+        end
+
+        private
+
+        def statement(statement_node)
+          if statement_node.return_type?
+            'return'
+          elsif statement_node.break_type?
+            'break'
+          else
+            statement_node.method_name
+          end
+        end
+
+        def in_rescue?(statement_node)
+          statement_node.ancestors.find(&:rescue_type?)
+        end
+
+        def nested_block?(statement_node)
+          return false unless statement_node.break_type?
+
+          !statement_node.ancestors.find(&:block_type?).method?(:transaction)
         end
       end
     end
   end
 end