rubocop 0.68.1 → 0.69.0

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

@@ -83,7 +83,7 @@ module RuboCop
         include MultilineElementIndentation
 
         MSG = 'Use %<configured_indentation_width>d spaces for indentation ' \
-              'in a hash, relative to %<base_description>s.'.freeze
+              'in a hash, relative to %<base_description>s.'
 
         def on_hash(node)
           check(node, nil) if node.loc.begin

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

@@ -16,7 +16,7 @@ module RuboCop
       #     123
       #   end
       #
-      # @example EnforcedStyle: consistent
+      # @example EnforcedStyle: consistent (default)
       #   # The first parameter should always be indented one step more than the
       #   # preceding line.
       #
@@ -43,7 +43,7 @@ module RuboCop
         include MultilineElementIndentation
 
         MSG = 'Use %<configured_indentation_width>d spaces for indentation ' \
-             'in method args, relative to %<base_description>s.'.freeze
+             'in method args, relative to %<base_description>s.'
 
         def on_def(node)
           return if node.arguments.empty?

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

@@ -12,32 +12,13 @@ module RuboCop
       #       this cop does not add any offenses for long here documents to
       #       avoid `Metrics/LineLength`'s offenses.
       #
-      # @example EnforcedStyle: auto_detection (default)
+      # @example EnforcedStyle: squiggly (default)
       #   # bad
       #   <<-RUBY
       #   something
       #   RUBY
       #
       #   # good
-      #   # When using Ruby 2.3 or higher.
-      #   <<~RUBY
-      #     something
-      #   RUBY
-      #
-      #   # good
-      #   # When using Ruby 2.2 or lower and enabled Rails department.
-      #   # The following is possible to enable Rails department by
-      #   # adding for example:
-      #   #
-      #   # Rails:
-      #   #   Enabled: true
-      #   #
-      #   <<-RUBY.strip_heredoc
-      #     something
-      #   RUBY
-      #
-      # @example EnforcedStyle: squiggly
-      #   # good
       #   # When EnforcedStyle is squiggly, bad code is auto-corrected to the
       #   # following code.
       #   <<~RUBY
@@ -56,7 +37,7 @@ module RuboCop
       #   # good
       #   # When EnforcedStyle is powerpack, bad code is auto-corrected to
       #   # the following code.
-      #   <<-RUBY.strip_indent
+      #   <<~RUBY
       #     something
       #   RUBY
       #
@@ -75,11 +56,11 @@ module RuboCop
 
         RUBY23_TYPE_MSG = 'Use %<indentation_width>d spaces for indentation ' \
                           'in a heredoc by using `<<~` instead of ' \
-                          '`%<current_indent_type>s`.'.freeze
+                          '`%<current_indent_type>s`.'
         RUBY23_WIDTH_MSG = 'Use %<indentation_width>d spaces for '\
-                           'indentation in a heredoc.'.freeze
+                           'indentation in a heredoc.'
         LIBRARY_MSG = 'Use %<indentation_width>d spaces for indentation in a ' \
-                      'heredoc by using %<method>s.'.freeze
+                      'heredoc by using %<method>s.'
         STRIP_METHODS = {
           unindent: 'unindent',
           active_support: 'strip_heredoc',
@@ -117,17 +98,6 @@ module RuboCop
 
         private
 
-        def style
-          style = super
-          return style unless style == :auto_detection
-
-          if target_ruby_version >= 2.3
-            :squiggly
-          elsif rails?
-            :active_support
-          end
-        end
-
         def message(node)
           case style
           when :squiggly
@@ -198,8 +168,6 @@ module RuboCop
         end
 
         def correct_by_squiggly(node)
-          return if target_ruby_version < 2.3
-
           lambda do |corrector|
             if heredoc_indent_type(node) == '~'
               adjust_squiggly(corrector, node)
@@ -229,16 +197,10 @@ module RuboCop
         end
 
         def check_style!
-          case style
-          when nil
-            raise Warning, "Auto-correction does not work for #{cop_name}. " \
-                           'Please configure EnforcedStyle.'
-          when :squiggly
-            if target_ruby_version < 2.3
-              raise Warning, '`squiggly` style is selectable only on Ruby ' \
-                             "2.3 or higher for #{cop_name}."
-            end
-          end
+          return if style
+
+          raise Warning, "Auto-correction does not work for #{cop_name}. " \
+                         'Please configure EnforcedStyle.'
         end
 
         def indented_body(node)

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

@@ -121,7 +121,7 @@ module RuboCop
         include Alignment
         include ConfigurableEnforcedStyle
 
-        MSG = 'Inconsistent indentation detected.'.freeze
+        MSG = 'Inconsistent indentation detected.'
 
         def on_begin(node)
           check(node)

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

@@ -50,7 +50,7 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Use %<configured_indentation_width>d (not %<indentation>d) ' \
-              'spaces for%<name>s indentation.'.freeze
+              'spaces for%<name>s indentation.'
 
         SPECIAL_MODIFIERS = %w[private protected].freeze
 
@@ -342,7 +342,7 @@ module RuboCop
         end
 
         def leftmost_modifier_of(node)
-          return node unless node.parent && node.parent.send_type?
+          return node unless node.parent&.send_type?
 
           leftmost_modifier_of(node.parent)
         end

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

@@ -20,7 +20,7 @@ module RuboCop
       class InitialIndentation < Cop
         include RangeHelp
 
-        MSG = 'Indentation of first line in file detected.'.freeze
+        MSG = 'Indentation of first line in file detected.'
 
         def investigate(_processed_source)
           space_before(first_token) do |space|

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

@@ -28,7 +28,7 @@ module RuboCop
       #   # (start of file)
       #   # a comment
       class LeadingBlankLines < Cop
-        MSG = 'Unnecessary blank line at the beginning of the source.'.freeze
+        MSG = 'Unnecessary blank line at the beginning of the source.'
 
         def investigate(processed_source)
           token = processed_source.tokens[0]

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

@@ -19,7 +19,7 @@ module RuboCop
       class LeadingCommentSpace < Cop
         include RangeHelp
 
-        MSG = 'Missing space after `#`.'.freeze
+        MSG = 'Missing space after `#`.'
 
         def investigate(processed_source)
           processed_source.each_comment do |comment|

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

@@ -93,17 +93,17 @@ module RuboCop
 
         SAME_LINE_MESSAGE = 'The closing array brace must be on the same ' \
           'line as the last array element when the opening brace is on the ' \
-          'same line as the first array element.'.freeze
+          'same line as the first array element.'
 
         NEW_LINE_MESSAGE = 'The closing array brace must be on the line ' \
           'after the last array element when the opening brace is on a ' \
-          'separate line from the first array element.'.freeze
+          'separate line from the first array element.'
 
         ALWAYS_NEW_LINE_MESSAGE = 'The closing array brace must be on the ' \
-          'line after the last array element.'.freeze
+          'line after the last array element.'
 
         ALWAYS_SAME_LINE_MESSAGE = 'The closing array brace must be on the ' \
-          'same line as the last array element.'.freeze
+          'same line as the last array element.'
 
         def on_array(node)
           check_brace_layout(node)

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

@@ -24,7 +24,7 @@ module RuboCop
         include MultilineElementLineBreaks
 
         MSG = 'Each item in a multi-line array must start ' \
-          'on a separate line.'.freeze
+          'on a separate line.'
 
         def on_array(node)
           check_line_breaks(node, node.children)

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

@@ -37,10 +37,10 @@ module RuboCop
         include RangeHelp
 
         NEW_LINE_OFFENSE = 'Right hand side of multi-line assignment is on ' \
-          'the same line as the assignment operator `=`.'.freeze
+          'the same line as the assignment operator `=`.'
 
         SAME_LINE_OFFENSE = 'Right hand side of multi-line assignment is not ' \
-          'on the same line as the assignment operator `=`.'.freeze
+          'on the same line as the assignment operator `=`.'
 
         def check_assignment(node, rhs)
           return if node.send_type?

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

@@ -39,9 +39,9 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Block body expression is on the same line as ' \
-              'the block start.'.freeze
+              'the block start.'
         ARG_MSG = 'Block argument expression is not on the same line as the ' \
-                  'block start.'.freeze
+                  'block start.'
 
         def on_block(node)
           return if node.single_line?

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

@@ -93,17 +93,17 @@ module RuboCop
 
         SAME_LINE_MESSAGE = 'Closing hash brace must be on the same line as ' \
           'the last hash element when opening brace is on the same line as ' \
-          'the first hash element.'.freeze
+          'the first hash element.'
 
         NEW_LINE_MESSAGE = 'Closing hash brace must be on the line after ' \
           'the last hash element when opening brace is on a separate line ' \
-          'from the first hash element.'.freeze
+          'from the first hash element.'
 
         ALWAYS_NEW_LINE_MESSAGE = 'Closing hash brace must be on the line ' \
-          'after the last hash element.'.freeze
+          'after the last hash element.'
 
         ALWAYS_SAME_LINE_MESSAGE = 'Closing hash brace must be on the same ' \
-          'line as the last hash element.'.freeze
+          'line as the last hash element.'
 
         def self.autocorrect_incompatible_with
           [Style::BracesAroundHashParameters]

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

@@ -24,7 +24,7 @@ module RuboCop
         include MultilineElementLineBreaks
 
         MSG = 'Each key in a multi-line hash must start on a ' \
-          'separate line.'.freeze
+          'separate line.'
 
         def on_hash(node)
           # This cop only deals with hashes wrapped by a set of curly

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

@@ -23,7 +23,7 @@ module RuboCop
         include(MultilineElementLineBreaks)
 
         MSG = 'Each argument in a multi-line method call must start ' \
-          'on a separate line.'.freeze
+          'on a separate line.'
 
         def on_send(node)
           args = node.arguments

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

@@ -93,17 +93,17 @@ module RuboCop
 
         SAME_LINE_MESSAGE = 'Closing method call brace must be on the ' \
           'same line as the last argument when opening brace is on the same ' \
-          'line as the first argument.'.freeze
+          'line as the first argument.'
 
         NEW_LINE_MESSAGE = 'Closing method call brace must be on the ' \
           'line after the last argument when opening brace is on a separate ' \
-          'line from the first argument.'.freeze
+          'line from the first argument.'
 
         ALWAYS_NEW_LINE_MESSAGE = 'Closing method call brace must be on ' \
-          'the line after the last argument.'.freeze
+          'the line after the last argument.'
 
         ALWAYS_SAME_LINE_MESSAGE = 'Closing method call brace must be on ' \
-          'the same line as the last argument.'.freeze
+          'the same line as the last argument.'
 
         def on_send(node)
           check_brace_layout(node)

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

@@ -170,7 +170,7 @@ module RuboCop
           return unless rhs.source.start_with?('.')
 
           node = semantic_alignment_node(node)
-          return unless node && node.loc.selector
+          return unless node&.loc&.selector
 
           node.loc.dot.join(node.loc.selector)
         end
@@ -183,7 +183,7 @@ module RuboCop
           node = node.parent
           node = node.parent until node.loc.dot
 
-          node.receiver.source_range if node
+          node&.receiver&.source_range
         end
 
         def semantic_alignment_node(node)

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

@@ -105,17 +105,17 @@ module RuboCop
 
         SAME_LINE_MESSAGE = 'Closing method definition brace must be on the ' \
           'same line as the last parameter when opening brace is on the same ' \
-          'line as the first parameter.'.freeze
+          'line as the first parameter.'
 
         NEW_LINE_MESSAGE = 'Closing method definition brace must be on the ' \
           'line after the last parameter when opening brace is on a separate ' \
-          'line from the first parameter.'.freeze
+          'line from the first parameter.'
 
         ALWAYS_NEW_LINE_MESSAGE = 'Closing method definition brace must be ' \
-          'on the line after the last parameter.'.freeze
+          'on the line after the last parameter.'
 
         ALWAYS_SAME_LINE_MESSAGE = 'Closing method definition brace must be ' \
-          'on the same line as the last parameter.'.freeze
+          'on the same line as the last parameter.'
 
         def on_def(node)
           check_brace_layout(node.arguments)

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

@@ -26,7 +26,7 @@ module RuboCop
 
         MSG = '`%<kw_loc>s` at %<kw_loc_line>d, %<kw_loc_column>d is not ' \
               'aligned with `%<beginning>s` at ' \
-              '%<begin_loc_line>d, %<begin_loc_column>d.'.freeze
+              '%<begin_loc_line>d, %<begin_loc_column>d.'
         ANCESTOR_TYPES = %i[kwbegin def defs class module].freeze
         RUBY_2_5_ANCESTOR_TYPES = (ANCESTOR_TYPES + %i[block]).freeze
         ANCESTOR_TYPES_WITH_ACCESS_MODIFIERS = %i[def defs].freeze
@@ -140,7 +140,7 @@ module RuboCop
         def assignment_node(node)
           assignment_node = node.ancestors.first
           return nil unless
-            assignment_node && assignment_node.assignment?
+            assignment_node&.assignment?
 
           assignment_node
         end

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

@@ -14,7 +14,7 @@ module RuboCop
       #   # good
       #   def f(a:, b: 2); {a: 3}; end
       class SpaceAfterColon < Cop
-        MSG = 'Space missing after colon.'.freeze
+        MSG = 'Space missing after colon.'
 
         def on_pair(node)
           return unless node.colon?

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

@@ -18,11 +18,11 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Do not put a space between a method name and the opening ' \
-              'parenthesis.'.freeze
+              'parenthesis.'
 
         def on_def(node)
           args = node.arguments
-          return unless args.loc.begin && args.loc.begin.is?('(')
+          return unless args.loc.begin&.is?('(')
 
           expr = args.source_range
           pos_before_left_paren = range_between(expr.begin_pos - 1,

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

@@ -14,7 +14,7 @@ module RuboCop
       class SpaceAfterNot < Cop
         include RangeHelp
 
-        MSG = 'Do not leave space between `!` and its argument.'.freeze
+        MSG = 'Do not leave space between `!` and its argument.'
 
         def on_send(node)
           return unless node.prefix_bang? && whitespace_after_operator?(node)

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

@@ -32,7 +32,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = 'Surrounding space %<type>s in default value assignment.'.freeze
+        MSG = 'Surrounding space %<type>s in default value assignment.'
 
         def on_optarg(node)
           index = index_of_first_token(node)

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

@@ -25,11 +25,11 @@ module RuboCop
       #
       #   something = 123 if test
       class SpaceAroundKeyword < Cop
-        MSG_BEFORE = 'Space before keyword `%<range>s` is missing.'.freeze
-        MSG_AFTER = 'Space after keyword `%<range>s` is missing.'.freeze
+        MSG_BEFORE = 'Space before keyword `%<range>s` is missing.'
+        MSG_AFTER = 'Space after keyword `%<range>s` is missing.'
 
-        DO = 'do'.freeze
-        SAFE_NAVIGATION = '&.'.freeze
+        DO = 'do'
+        SAFE_NAVIGATION = '&.'
         ACCEPT_LEFT_PAREN =
           %w[break defined? next not rescue return super yield].freeze
         ACCEPT_LEFT_SQUARE_BRACKET =
@@ -60,7 +60,7 @@ module RuboCop
         end
 
         def on_if(node)
-          check(node, %i[keyword else begin end].freeze, 'then'.freeze)
+          check(node, %i[keyword else begin end].freeze, 'then')
         end
 
         def on_kwbegin(node)
@@ -129,9 +129,9 @@ module RuboCop
 
         def autocorrect(range)
           if space_before_missing?(range)
-            ->(corrector) { corrector.insert_before(range, ' '.freeze) }
+            ->(corrector) { corrector.insert_before(range, ' ') }
           else
-            ->(corrector) { corrector.insert_after(range, ' '.freeze) }
+            ->(corrector) { corrector.insert_after(range, ' ') }
           end
         end
 
@@ -165,7 +165,7 @@ module RuboCop
         end
 
         def do?(node)
-          node.loc.begin && node.loc.begin.is?(DO)
+          node.loc.begin&.is?(DO)
         end
 
         def check_keyword(node, range)
@@ -182,7 +182,7 @@ module RuboCop
 
         def space_before_missing?(range)
           pos = range.begin_pos - 1
-          return false if pos < 0
+          return false if pos.negative?
 
           range.source_buffer.source[pos] !~ /[\s\(\|\{\[;,\*\=]/
         end