From b74094d28e37a9671b8e52486b4d89886004c480 Mon Sep 17 00:00:00 2001
From: ohbarye <over.rye@gmail.com>
Date: Wed, 6 Jan 2021 23:58:03 +0900
Subject: [PATCH] [Fix #415] Make `Rails/HasManyOrHasOneDependent` accept
 association extension

---
 CHANGELOG.md                                        |  2 ++
 .../cop/rails/has_many_or_has_one_dependent.rb      |  8 +++++++-
 .../cop/rails/has_many_or_has_one_dependent_spec.rb | 13 +++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 593166ddca..cc4057cddd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changes
 
 * [#409](https://github.com/rubocop-hq/rubocop-rails/pull/409): Deconstruct "table.column" in `Rails/WhereNot`. ([@mobilutz][])
+* [#416](https://github.com/rubocop-hq/rubocop-rails/pull/416): Make `Rails/HasManyOrHasOneDependent` accept combination of association extension and `with_options`. ([@ohbarye][])
 
 ## 2.9.1 (2020-12-16)
 
@@ -329,3 +330,4 @@
 [@Tietew]: https://github.com/Tietew
 [@cilim]: https://github.com/cilim
 [@flanger001]: https://github.com/flanger001
+[@ohbarye]: https://github.com/ohbarye
diff --git a/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb b/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb
index a4153389a0..4c831035d8 100644
--- a/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb
+++ b/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb
@@ -51,6 +51,12 @@ class HasManyOrHasOneDependent < Base
             (args) ...)
         PATTERN
 
+        def_node_matcher :association_extension_block?, <<~PATTERN
+          (block
+            (send nil? :has_many _)
+            (args) ...)
+        PATTERN
+
         def on_send(node)
           return if active_resource?(node.parent)
           return if !association_without_options?(node) && valid_options?(association_with_options?(node))
@@ -64,7 +70,7 @@ def on_send(node)
         def valid_options_in_with_options_block?(node)
           return true unless node.parent
 
-          n = node.parent.begin_type? ? node.parent.parent : node.parent
+          n = node.parent.begin_type? || association_extension_block?(node.parent) ? node.parent.parent : node.parent
 
           contain_valid_options_in_with_options_block?(n)
         end
diff --git a/spec/rubocop/cop/rails/has_many_or_has_one_dependent_spec.rb b/spec/rubocop/cop/rails/has_many_or_has_one_dependent_spec.rb
index 2d9ab5e603..a99b4a9a9a 100644
--- a/spec/rubocop/cop/rails/has_many_or_has_one_dependent_spec.rb
+++ b/spec/rubocop/cop/rails/has_many_or_has_one_dependent_spec.rb
@@ -132,6 +132,19 @@ class Person < ApplicationRecord
         RUBY
       end
 
+      it "doesn't register an offense for `with_options dependent: :destroy` and for using association extension" do
+        expect_no_offenses(<<~RUBY)
+          class Person < ApplicationRecord
+            with_options dependent: :destroy do
+              has_many :foo do
+                def bar
+                end
+              end
+            end
+          end
+        RUBY
+      end
+
       context 'Multiple associations' do
         it "doesn't register an offense for " \
            '`with_options dependent: :destroy`' do