Merge pull request #736 from rubocop/fix-false-negative-in-rails-dele…

…gate

[Fix #712] Fixed false negative when visibility modifier is declared in nested class

changelog/fix_false_negative_when_nested_classes_has_private_or_protected_methods.md

@@ -0,0 +1 @@
+* [#712](https://github.com/rubocop/rubocop-rails/issues/712): Fix false negative in `Rails/Delegate` when preceding nested class declares private or protected methods. ([@Darhazer][])

lib/rubocop/cop/rails/delegate.rb

@@ -54,6 +54,7 @@ module Rails
       #   delegate :bar, to: :foo, prefix: true
       class Delegate < Base
         extend AutoCorrector
+        include VisibilityHelp
 
         MSG = 'Use `delegate` to define delegations.'
 
@@ -112,17 +113,11 @@ def prefixed_method_name(body)
         end
 
         def private_or_protected_delegation(node)
-          line = node.first_line
-          private_or_protected_before(line) ||
-            private_or_protected_inline(line)
+          private_or_protected_inline(node) || node_visibility(node) != :public
         end
 
-        def private_or_protected_before(line)
-          (processed_source[0..line].map(&:strip) & %w[private protected]).any?
-        end
-
-        def private_or_protected_inline(line)
-          processed_source[line - 1].strip.match?(/\A(private )|(protected )/)
+        def private_or_protected_inline(node)
+          processed_source[node.first_line - 1].strip.match?(/\A(private )|(protected )/)
         end
       end
     end

spec/rubocop/cop/rails/delegate_spec.rb

@@ -125,7 +125,7 @@ def fox
         bar.fox
       end
 
-        private
+      private
 
       def fox
         bar.fox
@@ -147,6 +147,41 @@ def fox
     RUBY
   end
 
+  it 'works with private methods declared in inner classes' do
+    expect_offense(<<~RUBY)
+      class A
+        class B
+
+          private
+
+          def foo
+            bar.foo
+          end
+        end
+
+        def baz
+        ^^^ Use `delegate` to define delegations.
+          foo.baz
+        end
+      end
+    RUBY
+
+    expect_correction(<<~RUBY)
+      class A
+        class B
+
+          private
+
+          def foo
+            bar.foo
+          end
+        end
+
+        delegate :baz, to: :foo
+      end
+    RUBY
+  end
+
   it 'ignores delegation with assignment' do
     expect_no_offenses(<<~RUBY)
       def new