lib/rubocop/cop/mixin/def_node.rb in rubocop-1.31.1 vs lib/rubocop/cop/mixin/def_node.rb in rubocop-1.31.2

@@ -3,24 +3,19 @@
 module RuboCop
   module Cop
     # Common functionality for checking def nodes.
     module DefNode
       extend NodePattern::Macros
+      include VisibilityHelp
 
-      NON_PUBLIC_MODIFIERS = %w[private protected].freeze
-
       private
 
       def non_public?(node)
         non_public_modifier?(node.parent) || preceding_non_public_modifier?(node)
       end
 
       def preceding_non_public_modifier?(node)
-        stripped_source_upto(node.first_line).any? { |line| NON_PUBLIC_MODIFIERS.include?(line) }
-      end
-
-      def stripped_source_upto(index)
-        processed_source[0..index].map(&:strip)
+        node_visibility(node) != :public
       end
 
       # @!method non_public_modifier?(node)
       def_node_matcher :non_public_modifier?, <<~PATTERN
         (send nil? {:private :protected} ({def defs} ...))