rubocop 0.68.1 → 0.69.0

data/lib/rubocop/cop/badge.rb

@@ -13,7 +13,7 @@ module RuboCop
       # Error raised when a badge parse fails.
       class InvalidBadge < Error
         MSG = 'Invalid badge %<badge>p. ' \
-              'Expected `Department/CopName` or `CopName`.'.freeze
+              'Expected `Department/CopName` or `CopName`.'
 
         def initialize(token)
           super(format(MSG, badge: token))

data/lib/rubocop/cop/bundler/duplicated_gem.rb

@@ -29,7 +29,7 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Gem `%<gem_name>s` requirements already given on line '\
-          '%<line_of_first_occurrence>d of the Gemfile.'.freeze
+          '%<line_of_first_occurrence>d of the Gemfile.'
 
         def investigate(processed_source)
           return if processed_source.blank?

data/lib/rubocop/cop/bundler/gem_comment.rb

@@ -18,7 +18,7 @@ module RuboCop
       class GemComment < Cop
         include DefNode
 
-        MSG = 'Missing gem description comment.'.freeze
+        MSG = 'Missing gem description comment.'
 
         def_node_matcher :gem_declaration?, '(send nil? :gem str ...)'
 

data/lib/rubocop/cop/bundler/insecure_protocol_source.rb

@@ -31,7 +31,7 @@ module RuboCop
         MSG = 'The source `:%<source>s` is deprecated because HTTP requests ' \
               'are insecure. ' \
               "Please change your source to 'https://rubygems.org' " \
-              "if possible, or 'http://rubygems.org' if not.".freeze
+              "if possible, or 'http://rubygems.org' if not."
 
         def_node_matcher :insecure_protocol_source?, <<-PATTERN
           (send nil? :source

data/lib/rubocop/cop/bundler/ordered_gems.rb

@@ -30,7 +30,7 @@ module RuboCop
 
         MSG = 'Gems should be sorted in an alphabetical order within their '\
               'section of the Gemfile. '\
-              'Gem `%<previous>s` should appear before `%<current>s`.'.freeze
+              'Gem `%<previous>s` should appear before `%<current>s`.'
 
         def investigate(processed_source)
           return if processed_source.blank?

data/lib/rubocop/cop/correctors/alignment_corrector.rb

@@ -44,7 +44,7 @@ module RuboCop
           # We must not change indentation of heredoc strings.
           return if heredoc_ranges.any? { |h| within?(range, h) }
 
-          if column_delta > 0
+          if column_delta.positive?
             unless range.source == "\n"
               # TODO: Fix ranges instead of using `begin`
               corrector.insert_before(range.begin, ' ' * column_delta)
@@ -71,7 +71,7 @@ module RuboCop
         def calculate_range(expr, line_begin_pos, column_delta)
           starts_with_space =
             expr.source_buffer.source[line_begin_pos].start_with?(' ')
-          pos_to_remove = if column_delta > 0 || starts_with_space
+          pos_to_remove = if column_delta.positive? || starts_with_space
                             line_begin_pos
                           else
                             line_begin_pos - column_delta.abs

data/lib/rubocop/cop/correctors/each_to_for_corrector.rb

@@ -7,8 +7,8 @@ module RuboCop
       extend NodePattern::Macros
 
       CORRECTION_WITH_ARGUMENTS =
-        'for %<variables>s in %<collection>s do'.freeze
-      CORRECTION_WITHOUT_ARGUMENTS = 'for _ in %<enumerable>s do'.freeze
+        'for %<variables>s in %<collection>s do'
+      CORRECTION_WITHOUT_ARGUMENTS = 'for _ in %<enumerable>s do'
 
       def initialize(block_node)
         @block_node = block_node

data/lib/rubocop/cop/correctors/for_to_each_corrector.rb

@@ -6,7 +6,7 @@ module RuboCop
     class ForToEachCorrector
       extend NodePattern::Macros
 
-      CORRECTION = '%<collection>s.each do |%<argument>s|'.freeze
+      CORRECTION = '%<collection>s.each do |%<argument>s|'
 
       def initialize(for_node)
         @for_node        = for_node

data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb

@@ -70,7 +70,7 @@ module RuboCop
 
       def remove_trailing_whitespace(corrector)
         size = block_begin.begin_pos - arguments.source_range.end_pos - 1
-        corrector.remove_preceding(block_begin, size) if size > 0
+        corrector.remove_preceding(block_begin, size) if size.positive?
       end
 
       def replace_delimiters(corrector)
@@ -93,11 +93,11 @@ module RuboCop
       end
 
       def arguments_end_pos
-        arguments.loc.end && arguments.loc.end.end_pos
+        arguments.loc.end&.end_pos
       end
 
       def arguments_begin_pos
-        arguments.loc.begin && arguments.loc.begin.begin_pos
+        arguments.loc.begin&.begin_pos
       end
 
       def block_end
@@ -117,12 +117,12 @@ module RuboCop
 
         parent = current_node.parent
 
-        if parent && parent.pair_type?
+        if parent&.pair_type?
           current_node = parent.parent
           parent = current_node.parent
         end
 
-        return false unless parent && parent.send_type?
+        return false unless parent&.send_type?
         return false if parent.parenthesized_call?
 
         current_node.sibling_index > 1

data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb

@@ -32,7 +32,7 @@ module RuboCop
       attr_reader :node, :processed_source
 
       def correct_same_line_brace(corrector)
-        corrector.insert_before(node.loc.end, "\n".freeze)
+        corrector.insert_before(node.loc.end, "\n")
       end
 
       def correct_next_line_brace(corrector)

data/lib/rubocop/cop/correctors/parentheses_corrector.rb

@@ -19,7 +19,7 @@ module RuboCop
         private
 
         def ternary_condition?(node)
-          node.parent && node.parent.if_type? && node.parent.ternary?
+          node.parent&.if_type? && node.parent&.ternary?
         end
 
         def next_char_is_question_mark?(node)

data/lib/rubocop/cop/gemspec/duplicated_assignment.rb

@@ -38,7 +38,7 @@ module RuboCop
         include RangeHelp
 
         MSG = '`%<assignment>s` method calls already given on line '\
-              '%<line_of_first_occurrence>d of the gemspec.'.freeze
+              '%<line_of_first_occurrence>d of the gemspec.'
 
         def_node_search :gem_specification, <<-PATTERN
           (block

data/lib/rubocop/cop/gemspec/ordered_dependencies.rb

@@ -57,7 +57,6 @@ module RuboCop
         MSG = 'Dependencies should be sorted in an alphabetical order within ' \
               'their section of the gemspec. '\
               'Dependency `%<previous>s` should appear before `%<current>s`.'
-              .freeze
 
         def investigate(processed_source)
           return if processed_source.blank?

data/lib/rubocop/cop/gemspec/required_ruby_version.rb

@@ -9,37 +9,37 @@ module RuboCop
       # required by gemspec.
       #
       # @example
-      #   # When `TargetRubyVersion` of .rubocop.yml is `2.3`.
+      #   # When `TargetRubyVersion` of .rubocop.yml is `2.5`.
       #
       #   # bad
       #   Gem::Specification.new do |spec|
-      #     spec.required_ruby_version = '>= 2.2.0'
+      #     spec.required_ruby_version = '>= 2.4.0'
       #   end
       #
       #   # bad
       #   Gem::Specification.new do |spec|
-      #     spec.required_ruby_version = '>= 2.4.0'
+      #     spec.required_ruby_version = '>= 2.6.0'
       #   end
       #
       #   # good
       #   Gem::Specification.new do |spec|
-      #     spec.required_ruby_version = '>= 2.3.0'
+      #     spec.required_ruby_version = '>= 2.5.0'
       #   end
       #
       #   # good
       #   Gem::Specification.new do |spec|
-      #     spec.required_ruby_version = '>= 2.3'
+      #     spec.required_ruby_version = '>= 2.5'
       #   end
       #
       #   # good
       #   Gem::Specification.new do |spec|
-      #     spec.required_ruby_version = ['>= 2.3.0', '< 2.5.0']
+      #     spec.required_ruby_version = ['>= 2.5.0', '< 2.7.0']
       #   end
       class RequiredRubyVersion < Cop
         MSG = '`required_ruby_version` (%<required_ruby_version>s, ' \
               'declared in %<gemspec_filename>s) and `TargetRubyVersion` ' \
               '(%<target_ruby_version>s, which may be specified in ' \
-              '.rubocop.yml) should be equal.'.freeze
+              '.rubocop.yml) should be equal.'
 
         def_node_search :required_ruby_version, <<-PATTERN
           (send _ :required_ruby_version= ${(str _) (array (str _))})

data/lib/rubocop/cop/generator.rb

@@ -7,7 +7,7 @@ module RuboCop
     # This generator will take a cop name and generate a source file
     # and spec file when given a valid qualified cop name.
     class Generator
-      SOURCE_TEMPLATE = <<-RUBY.strip_indent
+      SOURCE_TEMPLATE = <<~RUBY
         # frozen_string_literal: true
 
         # TODO: when finished, run `rake generate_cops_documentation` to update the docs
@@ -72,7 +72,7 @@ module RuboCop
         end
       RUBY
 
-      SPEC_TEMPLATE = <<-SPEC.strip_indent
+      SPEC_TEMPLATE = <<~SPEC
         # frozen_string_literal: true
 
         RSpec.describe RuboCop::Cop::%<department>s::%<cop_name>s do
@@ -84,21 +84,21 @@ module RuboCop
           #
           # For example
           it 'registers an offense when using `#bad_method`' do
-            expect_offense(<<-RUBY.strip_indent)
+            expect_offense(<<~RUBY)
               bad_method
               ^^^^^^^^^^ Use `#good_method` instead of `#bad_method`.
             RUBY
           end
 
           it 'does not register an offense when using `#good_method`' do
-            expect_no_offenses(<<-RUBY.strip_indent)
+            expect_no_offenses(<<~RUBY)
               good_method
             RUBY
           end
         end
       SPEC
 
-      CONFIGURATION_ADDED_MESSAGE = <<-MESSAGE.strip_indent
+      CONFIGURATION_ADDED_MESSAGE = <<~MESSAGE
         [modify] A configuration for the cop is added into %<configuration_file_path>s.
                  If you want to disable the cop by default, set `Enabled` option to false.
       MESSAGE
@@ -140,7 +140,7 @@ module RuboCop
       end
 
       def todo
-        <<-TODO.strip_indent
+        <<~TODO
           Do 3 steps:
             1. Add an entry to the "New features" section in CHANGELOG.md,
                e.g. "Add new `#{badge}` cop. ([@#{github_user}][])"

data/lib/rubocop/cop/generator/configuration_injector.rb

@@ -7,11 +7,11 @@ module RuboCop
       # It looks for other directives that require files in the same (cop)
       # namespace and injects the provided one in alpha
       class ConfigurationInjector
-        TEMPLATE = <<-YAML.strip_indent
-                     %<badge>s:
-                       Description: 'TODO: Write a description of the cop.'
-                       Enabled: true
-                       VersionAdded: '%<version_added>s'
+        TEMPLATE = <<~YAML
+          %<badge>s:
+            Description: 'TODO: Write a description of the cop.'
+            Enabled: true
+            VersionAdded: '%<version_added>s'
 
         YAML
 

data/lib/rubocop/cop/internal_affairs/node_destructuring.rb

@@ -17,7 +17,7 @@ module RuboCop
       #   method_name = send_node.method_name
       class NodeDestructuring < Cop
         MSG = 'Use the methods provided with the node extensions instead ' \
-              'of manually destructuring nodes.'.freeze
+              'of manually destructuring nodes.'
 
         def_node_matcher :node_variable?, <<-PATTERN
           {(lvar [#node_suffix? _]) (send nil? [#node_suffix? _])}

data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb

@@ -14,7 +14,7 @@ module RuboCop
       #   node.send_type?
       #
       class NodeTypePredicate < Cop
-        MSG = 'Use `#%<type>s_type?` to check node type.'.freeze
+        MSG = 'Use `#%<type>s_type?` to check node type.'
 
         def_node_matcher :node_type_check, <<-PATTERN
           (send (send $_ :type) :== (sym $_))

data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb

@@ -15,7 +15,7 @@ module RuboCop
       #   add_offense(node, location: :selector)
       class OffenseLocationKeyword < Cop
         MSG = 'Use `:%<keyword>s` as the location argument to ' \
-              '`#add_offense`.'.freeze
+              '`#add_offense`.'
 
         def on_send(node)
           node_type_check(node) do |node_arg, kwargs|

data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb

@@ -19,7 +19,7 @@ module RuboCop
       class RedundantLocationArgument < Cop
         include RangeHelp
 
-        MSG = 'Redundant location argument to `#add_offense`.'.freeze
+        MSG = 'Redundant location argument to `#add_offense`.'
 
         def_node_matcher :redundant_location_argument, <<-PATTERN
           (send nil? :add_offense _

data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb

@@ -22,7 +22,7 @@ module RuboCop
       class RedundantMessageArgument < Cop
         include RangeHelp
 
-        MSG = 'Redundant message argument to `#add_offense`.'.freeze
+        MSG = 'Redundant message argument to `#add_offense`.'
 
         def_node_matcher :node_type_check, <<-PATTERN
           (send nil? :add_offense $_node $hash)

data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb

@@ -14,7 +14,7 @@ module RuboCop
       #     expect(cop.messages).to eq(['Do not write bad code like that.'])
       #
       class UselessMessageAssertion < Cop
-        MSG = 'Do not specify cop behavior using `described_class::MSG`.'.freeze
+        MSG = 'Do not specify cop behavior using `described_class::MSG`.'
 
         def_node_search :described_class_msg, <<-PATTERN
           (const (send nil? :described_class) :MSG)

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

@@ -37,10 +37,10 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = '%<style>s access modifiers like `%<node>s`.'.freeze
+        MSG = '%<style>s access modifiers like `%<node>s`.'
 
         def on_class(node)
-          return unless node.body && node.body.begin_type?
+          return unless node.body&.begin_type?
 
           check_body(node.body, node)
         end

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

@@ -41,10 +41,10 @@ module RuboCop
         include Alignment
 
         ALIGN_PARAMS_MSG = 'Align the arguments of a method call if ' \
-          'they span more than one line.'.freeze
+          'they span more than one line.'
 
         FIXED_INDENT_MSG = 'Use one level of indentation for arguments ' \
-          'following the first line of a multi-line method call.'.freeze
+          'following the first line of a multi-line method call.'
 
         def on_send(node)
           return if node.arguments.size < 2 ||

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

@@ -24,7 +24,7 @@ module RuboCop
         include Alignment
 
         MSG = 'Align the elements of an array literal if they span more ' \
-              'than one line.'.freeze
+              'than one line.'
 
         def on_array(node)
           check_alignment(node.children)

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

@@ -178,7 +178,7 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Align the elements of a hash literal if they span more than ' \
-              'one line.'.freeze
+              'one line.'
 
         def on_send(node)
           return if double_splat?(node)
@@ -298,9 +298,9 @@ module RuboCop
         end
 
         def adjust(corrector, delta, range)
-          if delta > 0
+          if delta.positive?
             corrector.insert_before(range, ' ' * delta)
-          elsif delta < 0
+          elsif delta.negative?
             range = range_between(range.begin_pos - delta.abs, range.begin_pos)
             corrector.remove(range)
           end

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

@@ -72,10 +72,10 @@ module RuboCop
         include Alignment
 
         ALIGN_PARAMS_MSG = 'Align the parameters of a method definition if ' \
-          'they span more than one line.'.freeze
+          'they span more than one line.'
 
         FIXED_INDENT_MSG = 'Use one level of indentation for parameters ' \
-          'following the first line of a multi-line method definition.'.freeze
+          'following the first line of a multi-line method definition.'
 
         def on_def(node)
           return if node.arguments.size < 2

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

@@ -65,7 +65,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = '%<current>s is not aligned with %<prefer>s%<alt_prefer>s.'.freeze
+        MSG = '%<current>s is not aligned with %<prefer>s%<alt_prefer>s.'
 
         def_node_matcher :block_end_align_target?, <<-PATTERN
           {assignment?
@@ -90,9 +90,9 @@ module RuboCop
           loc_end = node.loc.end
           delta = start_col - loc_end.column
 
-          if delta > 0
+          if delta.positive?
             add_space_before(loc_end, delta)
-          elsif delta < 0
+          elsif delta.negative?
             remove_space_before(loc_end.begin_pos, -delta)
           end
         end
@@ -125,7 +125,7 @@ module RuboCop
         end
 
         def disqualified_parent?(parent, node)
-          parent && parent.loc && parent.first_line != node.first_line &&
+          parent&.loc && parent.first_line != node.first_line &&
             !parent.masgn_type?
         end
 

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

@@ -28,7 +28,6 @@ module RuboCop
         include Alignment
 
         MSG = 'Expression at %<line>d, %<column>d should be on its own line.'
-              .freeze
 
         def on_block(node)
           return if node.single_line?