rubocop 1.17.0 → 1.18.2

data/lib/rubocop/cop/style/multiple_comparison.rb

@@ -44,7 +44,7 @@ module RuboCop
         extend AutoCorrector
 
         MSG = 'Avoid comparing a variable with multiple items ' \
-          'in a conditional, use `Array#include?` instead.'
+              'in a conditional, use `Array#include?` instead.'
 
         def on_new_investigation
           @last_comparison = nil

data/lib/rubocop/cop/style/percent_literal_delimiters.rb

@@ -68,7 +68,7 @@ module RuboCop
           delimiters = preferred_delimiters_for(type)
 
           "`#{type}`-literals should be delimited by " \
-          "`#{delimiters[0]}` and `#{delimiters[1]}`."
+            "`#{delimiters[0]}` and `#{delimiters[1]}`."
         end
 
         def preferred_delimiters_for(type)

data/lib/rubocop/cop/style/quoted_symbols.rb

@@ -36,9 +36,9 @@ module RuboCop
         extend AutoCorrector
 
         MSG_SINGLE = "Prefer single-quoted symbols when you don't need string interpolation " \
-          'or special symbols.'
+                     'or special symbols.'
         MSG_DOUBLE = 'Prefer double-quoted symbols unless you need single quotes to ' \
-          'avoid extra backslashes for escaping.'
+                     'avoid extra backslashes for escaping.'
 
         def on_sym(node)
           return unless quoted?(node)

data/lib/rubocop/cop/style/redundant_regexp_character_class.rb

@@ -32,7 +32,7 @@ module RuboCop
 
         REQUIRES_ESCAPE_OUTSIDE_CHAR_CLASS_CHARS = '.*+?{}()|$'.chars.freeze
         MSG_REDUNDANT_CHARACTER_CLASS = 'Redundant single-element character class, ' \
-        '`%<char_class>s` can be replaced with `%<element>s`.'
+                                        '`%<char_class>s` can be replaced with `%<element>s`.'
 
         def on_regexp(node)
           each_redundant_character_class(node) do |loc|

data/lib/rubocop/cop/style/regexp_literal.rb

@@ -117,7 +117,7 @@ module RuboCop
         def allowed_percent_r_literal?(node)
           style == :slashes && contains_disallowed_slash?(node) ||
             style == :percent_r ||
-            allowed_mixed_percent_r?(node) || omit_parentheses_style?(node)
+            allowed_mixed_percent_r?(node) || allowed_omit_parentheses_with_percent_r_literal?(node)
         end
 
         def allowed_mixed_percent_r?(node)
@@ -149,8 +149,9 @@ module RuboCop
           config.for_cop('Style/PercentLiteralDelimiters') ['PreferredDelimiters']['%r'].chars
         end
 
-        def omit_parentheses_style?(node)
+        def allowed_omit_parentheses_with_percent_r_literal?(node)
           return false unless node.parent&.call_type?
+          return true if node.content.start_with?(' ')
 
           enforced_style = config.for_cop('Style/MethodCallWithArgsParentheses')['EnforcedStyle']
 

data/lib/rubocop/cop/style/special_global_vars.rb

@@ -53,10 +53,10 @@ module RuboCop
         extend AutoCorrector
 
         MSG_BOTH = 'Prefer `%<prefer>s` from the stdlib \'English\' ' \
-        'module (don\'t forget to require it) or `%<regular>s` over ' \
-        '`%<global>s`.'
+                   'module (don\'t forget to require it) or `%<regular>s` over ' \
+                   '`%<global>s`.'
         MSG_ENGLISH = 'Prefer `%<prefer>s` from the stdlib \'English\' ' \
-        'module (don\'t forget to require it) over `%<global>s`.'
+                      'module (don\'t forget to require it) over `%<global>s`.'
         MSG_REGULAR = 'Prefer `%<prefer>s` over `%<global>s`.'
 
         ENGLISH_VARS = { # rubocop:disable Style/MutableConstant

data/lib/rubocop/cop/style/string_concatenation.rb

@@ -15,18 +15,37 @@ module RuboCop
       # lines, this cop does not register an offense; instead,
       # `Style/LineEndConcatenation` will pick up the offense if enabled.
       #
-      # @example
+      # Two modes are supported:
+      # 1. `aggressive` style checks and corrects all occurrences of `+` where
+      # either the left or right side of `+` is a string literal.
+      # 2. `conservative` style on the other hand, checks and corrects only if
+      # left side (receiver of `+` method call) is a string literal.
+      # This is useful when the receiver is some expression that returns string like `Pathname`
+      # instead of a string literal.
+      #
+      # @example Mode: aggressive (default)
       #   # bad
       #   email_with_name = user.name + ' <' + user.email + '>'
+      #   Pathname.new('/') + 'test'
       #
       #   # good
       #   email_with_name = "#{user.name} <#{user.email}>"
       #   email_with_name = format('%s <%s>', user.name, user.email)
+      #   "#{Pathname.new('/')}test"
       #
       #   # accepted, line-end concatenation
       #   name = 'First' +
       #     'Last'
       #
+      # @example Mode: conservative
+      #   # bad
+      #   'Hello' + user.name
+      #
+      #   # good
+      #   "Hello #{user.name}"
+      #   user.name + '!!'
+      #   Pathname.new('/') + 'test'
+      #
       class StringConcatenation < Base
         include Util
         include RangeHelp
@@ -52,10 +71,15 @@ module RuboCop
           return if line_end_concatenation?(node)
 
           topmost_plus_node = find_topmost_plus_node(node)
+          parts = collect_parts(topmost_plus_node)
+          return unless parts[0..-2].any? { |receiver_node| offensive_for_mode?(receiver_node) }
 
-          parts = []
-          collect_parts(topmost_plus_node, parts)
+          register_offense(topmost_plus_node, parts)
+        end
+
+        private
 
+        def register_offense(topmost_plus_node, parts)
           add_offense(topmost_plus_node) do |corrector|
             correctable_parts = parts.none? { |part| uncorrectable?(part) }
             if correctable_parts && !corrected_ancestor?(topmost_plus_node)
@@ -67,7 +91,10 @@ module RuboCop
           end
         end
 
-        private
+        def offensive_for_mode?(receiver_node)
+          mode = cop_config['Mode'].to_sym
+          mode == :aggressive || mode == :conservative && receiver_node.str_type?
+        end
 
         def line_end_concatenation?(node)
           # If the concatenation happens at the end of the line,
@@ -87,7 +114,7 @@ module RuboCop
           current
         end
 
-        def collect_parts(node, parts)
+        def collect_parts(node, parts = [])
           return unless node
 
           if plus_node?(node)

data/lib/rubocop/cop/style/string_literals.rb

@@ -87,10 +87,10 @@ module RuboCop
         def message(_node)
           if style == :single_quotes
             "Prefer single-quoted strings when you don't need string " \
-            'interpolation or special symbols.'
+              'interpolation or special symbols.'
           else
             'Prefer double-quoted strings unless you need single quotes to ' \
-            'avoid extra backslashes for escaping.'
+              'avoid extra backslashes for escaping.'
           end
         end
 

data/lib/rubocop/cop/style/swap_values.rb

@@ -21,7 +21,7 @@ module RuboCop
         extend AutoCorrector
 
         MSG = 'Replace this and assignments at lines %<x_line>d '\
-          'and %<y_line>d with `%<replacement>s`.'
+              'and %<y_line>d with `%<replacement>s`.'
 
         SIMPLE_ASSIGNMENT_TYPES = %i[lvasgn ivasgn cvasgn gvasgn casgn].to_set.freeze
 

data/lib/rubocop/cop/style/unpack_first.rb

@@ -21,7 +21,7 @@ module RuboCop
         extend AutoCorrector
 
         MSG = 'Use `%<receiver>s.unpack1(%<format>s)` instead of '\
-          '`%<receiver>s.unpack(%<format>s)%<method>s`.'
+              '`%<receiver>s.unpack(%<format>s)%<method>s`.'
         RESTRICT_ON_SEND = %i[first [] slice at].freeze
 
         # @!method unpack_and_first_element?(node)

data/lib/rubocop/cop/variable_force/variable_table.rb

@@ -58,7 +58,7 @@ module RuboCop
 
           unless variable
             raise "Assigning to undeclared local variable \"#{name}\" " \
-                 "at #{node.source_range}, #{node.inspect}"
+                  "at #{node.source_range}, #{node.inspect}"
           end
 
           variable.assign(node)

data/lib/rubocop/options.rb

@@ -12,9 +12,9 @@ module RuboCop
   # @api private
   class Options
     E_STDIN_NO_PATH = '-s/--stdin requires exactly one path, relative to the ' \
-      'root of the project. RuboCop will use this path to determine which ' \
-      'cops are enabled (via eg. Include/Exclude), and so that certain cops ' \
-      'like Naming/FileName can be checked.'
+                      'root of the project. RuboCop will use this path to determine which ' \
+                      'cops are enabled (via eg. Include/Exclude), and so that certain cops ' \
+                      'like Naming/FileName can be checked.'
     EXITING_OPTIONS = %i[version verbose_version show_cops].freeze
     DEFAULT_MAXIMUM_EXCLUSION_ITEMS = 15
 
@@ -292,7 +292,7 @@ module RuboCop
 
       if display_only_fail_level_offenses_with_autocorrect?
         raise OptionArgumentError, '--autocorrect cannot be used with ' \
-          '--display-only-fail-level-offenses'
+                                   '--display-only-fail-level-offenses'
       end
       validate_auto_gen_config
       validate_auto_correct

data/lib/rubocop/rspec/cop_helper.rb

@@ -15,7 +15,7 @@ module CopHelper
     processed_source = parse_source(source, file)
     unless processed_source.valid_syntax?
       raise 'Error parsing example code: ' \
-        "#{processed_source.diagnostics.map(&:render).join("\n")}"
+            "#{processed_source.diagnostics.map(&:render).join("\n")}"
     end
 
     _investigate(cop, processed_source)

data/lib/rubocop/rspec/expect_offense.rb

@@ -195,7 +195,7 @@ module RuboCop
         return processed_source if processed_source.valid_syntax?
 
         raise 'Error parsing example code: ' \
-          "#{processed_source.diagnostics.map(&:render).join("\n")}"
+              "#{processed_source.diagnostics.map(&:render).join("\n")}"
       end
 
       def set_formatter_options

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.17.0'
+    STRING = '1.18.2'
 
     MSG = '%<version>s (using Parser %<parser_version>s, '\
           'rubocop-ast %<rubocop_ast_version>s, ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -319,6 +319,7 @@ files:
 - lib/rubocop/cop/layout/initial_indentation.rb
 - lib/rubocop/cop/layout/leading_comment_space.rb
 - lib/rubocop/cop/layout/leading_empty_lines.rb
+- lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb
 - lib/rubocop/cop/layout/line_length.rb
 - lib/rubocop/cop/layout/multiline_array_brace_layout.rb
 - lib/rubocop/cop/layout/multiline_array_line_breaks.rb
@@ -579,6 +580,7 @@ files:
 - lib/rubocop/cop/naming/file_name.rb
 - lib/rubocop/cop/naming/heredoc_delimiter_case.rb
 - lib/rubocop/cop/naming/heredoc_delimiter_naming.rb
+- lib/rubocop/cop/naming/inclusive_language.rb
 - lib/rubocop/cop/naming/memoized_instance_variable_name.rb
 - lib/rubocop/cop/naming/method_name.rb
 - lib/rubocop/cop/naming/method_parameter_name.rb
@@ -881,7 +883,7 @@ metadata:
   homepage_uri: https://rubocop.org/
   changelog_uri: https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.17/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.18/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
 post_install_message:
 rdoc_options: []