Merge pull request #685 from ydah/fix-override-incompatible-cop

Fix override RuboCop::Cop::Style::RedundantSelf.autocorrect_incompatible_with without breaking designation of future incompatible cop

Author: koic

lib/rubocop-rails.rb

@@ -13,3 +13,11 @@
 RuboCop::Rails::Inject.defaults!
 
 require_relative 'rubocop/cop/rails_cops'
+
+RuboCop::Cop::Style::RedundantSelf.singleton_class.prepend(
+  Module.new do
+    def autocorrect_incompatible_with
+      super.push(RuboCop::Cop::Rails::SafeNavigation)
+    end
+  end
+)

lib/rubocop/cop/rails/safe_navigation.rb

@@ -47,15 +47,6 @@ class SafeNavigation < Base
           (send _ ${:try :try!} $_ ...)
         PATTERN
 
-        # Monkey patching for `Style/RedundantSelf` of RuboCop core.
-        # rubocop:disable Style/ClassAndModuleChildren
-        class Style::RedundantSelf
-          def self.autocorrect_incompatible_with
-            [Rails::SafeNavigation]
-          end
-        end
-        # rubocop:enable Style/ClassAndModuleChildren
-
         def self.autocorrect_incompatible_with
           [Style::RedundantSelf]
         end