rubocop 0.84.0 → 0.85.0

data/lib/rubocop/cop/layout/space_around_method_call_operator.rb

@@ -72,7 +72,9 @@ module RuboCop
           left = previous_token(operator)
           right = next_token(operator)
 
-          no_space_offenses(node, operator, right, MSG) if !right.comment? && valid_right_token?(right, operator)
+          if !right.comment? && valid_right_token?(right, operator)
+            no_space_offenses(node, operator, right, MSG)
+          end
           return unless valid_left_token?(left, operator)
 
           no_space_offenses(node, left, operator, MSG) if add_left_offense

data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb

@@ -72,7 +72,9 @@ module RuboCop
 
           right_token = closing_bracket(tokens, left_token)
 
-          return empty_offenses(node, left_token, right_token, EMPTY_MSG) if empty_brackets?(left_token, right_token)
+          if empty_brackets?(left_token, right_token)
+            return empty_offenses(node, left_token, right_token, EMPTY_MSG)
+          end
 
           if style == :no_space
             no_space_offenses(node, left_token, right_token, MSG)

data/lib/rubocop/cop/lint/ambiguous_operator.rb

@@ -63,7 +63,8 @@ module RuboCop
             first_argument = send_node.first_argument
 
             first_argument &&
-              offense_position?(first_argument, diagnostic) && unary_operator?(first_argument, diagnostic)
+              offense_position?(first_argument, diagnostic) &&
+              unary_operator?(first_argument, diagnostic)
           end
         end
 

data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb

@@ -53,6 +53,8 @@ module RuboCop
         PATTERN
 
         def on_send(node)
+          return if node.arguments.any? { |arg| arg.variable? || arg.send_type? || arg.const_type? }
+
           add_offense(node) if algorithm_const(node)
         end
 
@@ -88,9 +90,7 @@ module RuboCop
         end
 
         def correction_range(node)
-          begin_pos = node.loc.selector.column
-          end_pos = node.loc.expression.last_column
-          range_between(begin_pos, end_pos)
+          range_between(node.loc.dot.end_pos, node.loc.expression.end_pos)
         end
 
         def openssl_class(node)
@@ -108,7 +108,11 @@ module RuboCop
         end
 
         def sanitize_arguments(arguments)
-          arguments.flat_map { |arg| arg.source.tr(":'", '').split('-') }
+          arguments.flat_map do |arg|
+            argument = arg.str_type? ? arg.value : arg.source
+
+            argument.tr(":'", '').split('-')
+          end
         end
 
         def replacement_args(node)

data/lib/rubocop/cop/lint/ensure_return.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Lint
-      # This cop checks for *return* from an *ensure* block.
+      # This cop checks for `return` from an `ensure` block.
       # Explicit return from an ensure block alters the control flow
       # as the return will take precedence over any exception being raised,
       # and the exception will be silently thrown away as if it were rescued.

data/lib/rubocop/cop/lint/erb_new_arguments.rb

@@ -143,7 +143,9 @@ module RuboCop
 
           overridden_kwargs[0] = "trim_mode: #{arguments[2].source}" if arguments[2]
 
-          overridden_kwargs[1] = "eoutvar: #{arguments[3].source}" if arguments[3] && !arguments[3].hash_type?
+          if arguments[3] && !arguments[3].hash_type?
+            overridden_kwargs[1] = "eoutvar: #{arguments[3].source}"
+          end
 
           overridden_kwargs
         end

data/lib/rubocop/cop/lint/loop.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Lint
-      # This cop checks for uses of *begin...end while/until something*.
+      # This cop checks for uses of `begin...end while/until something`.
       #
       # @example
       #

data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Lint
+      # Do not mix named captures and numbered captures in a Regexp literal
+      # because numbered capture is ignored if they're mixed.
+      # Replace numbered captures with non-capturing groupings or
+      # named captures.
+      #
+      #   # bad
+      #   /(?<foo>FOO)(BAR)/
+      #
+      #   # good
+      #   /(?<foo>FOO)(?<bar>BAR)/
+      #
+      #   # good
+      #   /(?<foo>FOO)(?:BAR)/
+      #
+      #   # good
+      #   /(FOO)(BAR)/
+      #
+      class MixedRegexpCaptureTypes < Cop
+        MSG = 'Do not mix named captures and numbered captures ' \
+              'in a Regexp literal.'
+
+        def on_regexp(node)
+          return if contain_non_literal?(node)
+
+          tree = Regexp::Parser.parse(node.content)
+          return unless named_capture?(tree)
+          return unless numbered_capture?(tree)
+
+          add_offense(node)
+        end
+
+        private
+
+        def contain_non_literal?(node)
+          if node.respond_to?(:type) && (node.variable? || node.send_type? || node.const_type?)
+            return true
+          end
+          return false unless node.respond_to?(:children)
+
+          node.children.any? { |child| contain_non_literal?(child) }
+        end
+
+        def named_capture?(tree)
+          tree.each_expression.any? do |e|
+            e.instance_of?(Regexp::Expression::Group::Capture)
+          end
+        end
+
+        def numbered_capture?(tree)
+          tree.each_expression.any? do |e|
+            e.instance_of?(Regexp::Expression::Group::Named)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/lint/nested_percent_literal.rb

@@ -42,7 +42,7 @@ module RuboCop
         def contains_percent_literals?(node)
           node.each_child_node.any? do |child|
             literal = child.children.first.to_s.scrub
-            REGEXES.any? { |regex| literal.match(regex) }
+            REGEXES.any? { |regex| literal.match?(regex) }
           end
         end
       end

data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb

@@ -6,13 +6,13 @@ module RuboCop
       # This cop checks for non-local exits from iterators without a return
       # value. It registers an offense under these conditions:
       #
-      #  - No value is returned,
-      #  - the block is preceded by a method chain,
-      #  - the block has arguments,
-      #  - the method which receives the block is not `define_method`
-      #    or `define_singleton_method`,
-      #  - the return is not contained in an inner scope, e.g. a lambda or a
-      #    method definition.
+      # * No value is returned,
+      # * the block is preceded by a method chain,
+      # * the block has arguments,
+      # * the method which receives the block is not `define_method`
+      # or `define_singleton_method`,
+      # * the return is not contained in an inner scope, e.g. a lambda or a
+      # method definition.
       #
       # @example
       #

data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb

@@ -44,7 +44,9 @@ module RuboCop
         private
 
         def valid_context?(node)
-          return true unless node.arguments.one? && first_argument_starts_with_left_parenthesis?(node)
+          unless node.arguments.one? && first_argument_starts_with_left_parenthesis?(node)
+            return true
+          end
 
           node.operator_method? || node.setter_method? || grouped_parentheses?(node)
         end

data/lib/rubocop/cop/lint/redundant_require_statement.rb

@@ -8,9 +8,9 @@ module RuboCop
       # The following features are unnecessary `require` statement because
       # they are already loaded.
       #
-      # ruby -ve 'p $LOADED_FEATURES.reject { |feature| %r|/| =~ feature }'
-      # ruby 2.2.8p477 (2017-09-14 revision 59906) [x86_64-darwin13]
-      # ["enumerator.so", "rational.so", "complex.so", "thread.rb"]
+      #   ruby -ve 'p $LOADED_FEATURES.reject { |feature| %r|/| =~ feature }'
+      #   ruby 2.2.8p477 (2017-09-14 revision 59906) [x86_64-darwin13]
+      #   ["enumerator.so", "rational.so", "complex.so", "thread.rb"]
       #
       # This cop targets Ruby 2.2 or higher containing these 4 features.
       #

data/lib/rubocop/cop/lint/rescue_exception.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Lint
-      # This cop checks for *rescue* blocks targeting the Exception class.
+      # This cop checks for `rescue` blocks targeting the Exception class.
       #
       # @example
       #

data/lib/rubocop/cop/lint/suppressed_exception.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Lint
-      # This cop checks for *rescue* blocks with no body.
+      # This cop checks for `rescue` blocks with no body.
       #
       # @example
       #
@@ -78,10 +78,12 @@ module RuboCop
 
         def comment_between_rescue_and_end?(node)
           end_line = nil
-          node.each_ancestor(:kwbegin) do |ancestor|
+          node.each_ancestor(:kwbegin, :def) do |ancestor|
             end_line = ancestor.loc.end.line
             break
           end
+          return false unless end_line
+
           processed_source[node.first_line...end_line].any? { |line| comment_line?(line) }
         end
       end

data/lib/rubocop/cop/lint/unreachable_code.rb

@@ -5,7 +5,7 @@ module RuboCop
     module Lint
       # This cop checks for unreachable code.
       # The check are based on the presence of flow of control
-      # statement in non-final position in *begin*(implicit) blocks.
+      # statement in non-final position in `begin` (implicit) blocks.
       #
       # @example
       #

data/lib/rubocop/cop/lint/useless_else_without_rescue.rb

@@ -5,7 +5,7 @@ module RuboCop
     module Lint
       # This cop checks for useless `else` in `begin..end` without `rescue`.
       #
-      # Note: This syntax is no longer valid on Ruby 2.6 or higher and
+      # NOTE: This syntax is no longer valid on Ruby 2.6 or higher and
       # this cop is going to be removed at some point the future.
       #
       # @example

data/lib/rubocop/cop/lint/useless_setter_call.rb

@@ -6,7 +6,7 @@ module RuboCop
       # This cop checks for setter call to local variable as the final
       # expression of a function definition.
       #
-      # Note: There are edge cases in which the local variable references a
+      # NOTE: There are edge cases in which the local variable references a
       # value that is also accessible outside the local scope. This is not
       # detected by the cop, and it can yield a false positive.
       #

data/lib/rubocop/cop/migration/department_name.rb

@@ -24,10 +24,12 @@ module RuboCop
 
             offset = Regexp.last_match(1).length
 
-            Regexp.last_match(4).scan(/[^,]+|[\W]+/) do |name|
+            Regexp.last_match(4).scan(/[^,]+|\W+/) do |name|
               trimmed_name = name.strip
 
-              check_cop_name(trimmed_name, comment, offset) unless valid_content_token?(trimmed_name)
+              unless valid_content_token?(trimmed_name)
+                check_cop_name(trimmed_name, comment, offset)
+              end
 
               break if contain_unexpected_character_for_department_name?(name)
 
@@ -41,7 +43,9 @@ module RuboCop
           cop_name = range.source
           qualified_cop_name = Cop.registry.qualified_cop_name(cop_name,
                                                                nil, shall_warn)
-          qualified_cop_name = qualified_legacy_cop_name(cop_name) unless qualified_cop_name.include?('/')
+          unless qualified_cop_name.include?('/')
+            qualified_cop_name = qualified_legacy_cop_name(cop_name)
+          end
 
           ->(corrector) { corrector.replace(range, qualified_cop_name) }
         end
@@ -60,8 +64,8 @@ module RuboCop
         end
 
         def valid_content_token?(content_token)
-          !/\W+/.match(content_token).nil? ||
-            !DISABLING_COPS_CONTENT_TOKEN.match(content_token).nil?
+          /\W+/.match?(content_token) ||
+            DISABLING_COPS_CONTENT_TOKEN.match?(content_token)
         end
 
         def contain_unexpected_character_for_department_name?(name)

data/lib/rubocop/cop/mixin/array_min_size.rb

@@ -38,7 +38,9 @@ module RuboCop
       def largest_brackets_size(style, ary_size)
         self.class.largest_brackets ||= -Float::INFINITY
 
-        self.class.largest_brackets = ary_size if style == :brackets && ary_size > self.class.largest_brackets
+        if style == :brackets && ary_size > self.class.largest_brackets
+          self.class.largest_brackets = ary_size
+        end
 
         self.class.largest_brackets
       end

data/lib/rubocop/cop/mixin/check_line_breakable.rb

@@ -131,7 +131,9 @@ module RuboCop
       def contained_by_multiline_collection_that_could_be_broken_up?(node)
         node.each_ancestor.find do |ancestor|
           if ancestor.hash_type? || ancestor.array_type?
-            return children_could_be_broken_up?(ancestor.children) if breakable_collection?(ancestor, ancestor.children)
+            if breakable_collection?(ancestor, ancestor.children)
+              return children_could_be_broken_up?(ancestor.children)
+            end
           end
 
           next unless ancestor.send_type?

data/lib/rubocop/cop/mixin/configurable_formatting.rb

@@ -23,7 +23,7 @@ module RuboCop
       end
 
       def valid_name?(node, name, given_style = style)
-        name.match(self.class::FORMATS.fetch(given_style)) ||
+        name.match?(self.class::FORMATS.fetch(given_style)) ||
           class_emitter_method?(node, name)
       end
 

data/lib/rubocop/cop/mixin/ignored_pattern.rb

@@ -18,7 +18,7 @@ module RuboCop
       end
 
       def matches_ignored_pattern?(line)
-        ignored_patterns.any? { |pattern| Regexp.new(pattern).match(line) }
+        ignored_patterns.any? { |pattern| Regexp.new(pattern).match?(line) }
       end
 
       def ignored_patterns

data/lib/rubocop/cop/mixin/line_length_help.rb

@@ -18,7 +18,7 @@ module RuboCop
 
         return false unless comment
 
-        comment.text.match(CommentConfig::COMMENT_DIRECTIVE_REGEXP)
+        comment.text.match?(CommentConfig::COMMENT_DIRECTIVE_REGEXP)
       end
 
       def allow_uri?

data/lib/rubocop/cop/mixin/multiline_element_indentation.rb

@@ -67,7 +67,9 @@ module RuboCop
           styles << :consistent
           styles << :special_inside_parentheses unless left_parenthesis
         end
-        styles << :special_inside_parentheses if left_parenthesis && column == left_parenthesis.column + 1
+        if left_parenthesis && column == left_parenthesis.column + 1
+          styles << :special_inside_parentheses
+        end
         styles << brace_alignment_style if column == left_brace.column
         styles
       end

data/lib/rubocop/cop/mixin/regexp_literal_help.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    # Common functionality for handling Regexp literals.
+    module RegexpLiteralHelp
+      private
+
+      def freespace_mode_regexp?(node)
+        regopt = node.children.find(&:regopt_type?)
+
+        regopt.children.include?(:x)
+      end
+    end
+  end
+end

data/lib/rubocop/cop/mixin/surrounding_space.rb

@@ -107,7 +107,9 @@ module RuboCop
 
       def empty_offenses(node, left, right, message)
         range = range_between(left.begin_pos, right.end_pos)
-        empty_offense(node, range, message, 'Use one') if offending_empty_space?(empty_config, left, right)
+        if offending_empty_space?(empty_config, left, right)
+          empty_offense(node, range, message, 'Use one')
+        end
         return unless offending_empty_no_space?(empty_config, left, right)
 
         empty_offense(node, range, message, 'Do not use')

data/lib/rubocop/cop/mixin/uncommunicative_name.rb

@@ -18,7 +18,7 @@ module RuboCop
           full_name = arg.children.first.to_s
           next if full_name == '_'
 
-          name = full_name.gsub(/\A([_]+)/, '')
+          name = full_name.gsub(/\A(_+)/, '')
           next if (arg.restarg_type? || arg.kwrestarg_type?) && name.empty?
           next if allowed_names.include?(name)
 

data/lib/rubocop/cop/naming/class_and_module_camel_case.rb

@@ -6,6 +6,12 @@ module RuboCop
       # This cop checks for class and module names with
       # an underscore in them.
       #
+      # `AllowedNames` config takes an array of permitted names.
+      # Its default value is `['module_parent']`.
+      # These names can be full class/module names or part of the name.
+      # eg. Adding `my_class` to the `AllowedNames` config will allow names like
+      # `my_class`, `my_class::User`, `App::my_class`, `App::my_class::User`, etc.
+      #
       # @example
       #   # bad
       #   class My_Class
@@ -18,11 +24,15 @@ module RuboCop
       #   end
       #   module MyModule
       #   end
+      #   class module_parent::MyModule
+      #   end
       class ClassAndModuleCamelCase < Cop
         MSG = 'Use CamelCase for classes and modules.'
 
         def on_class(node)
-          return unless /_/.match?(node.loc.name.source)
+          allowed = /#{cop_config['AllowedNames'].join('|')}/
+          name = node.loc.name.source.gsub(allowed, '')
+          return unless /_/.match?(name)
 
           add_offense(node, location: :name)
         end