rubocop 0.68.1 → 0.69.0

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

@@ -48,9 +48,9 @@ module RuboCop
         VARIABLE_TYPES = AST::Node::VARIABLES
         NON_COMPLEX_TYPES = [*VARIABLE_TYPES, :const, :defined?, :yield].freeze
 
-        MSG = '%<command>s parentheses for ternary conditions.'.freeze
+        MSG = '%<command>s parentheses for ternary conditions.'
         MSG_COMPLEX = '%<command>s parentheses for ternary expressions with' \
-          ' complex conditions.'.freeze
+          ' complex conditions.'
 
         def on_if(node)
           return unless node.ternary? && !infinite_loop? && offense?(node)

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

@@ -19,7 +19,7 @@ module RuboCop
         include Alignment
         include TrailingBody
 
-        MSG = 'Place the first line of class body on its own line.'.freeze
+        MSG = 'Place the first line of class body on its own line.'
 
         def on_class(node)
           return unless trailing_body?(node)

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

@@ -29,7 +29,7 @@ module RuboCop
         include TrailingBody
 
         MSG = "Place the first line of a multi-line method definition's " \
-              'body on its own line.'.freeze
+              'body on its own line.'
 
         def on_def(node)
           return unless trailing_body?(node)

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

@@ -19,7 +19,7 @@ module RuboCop
         include Alignment
         include TrailingBody
 
-        MSG = 'Place the first line of module body on its own line.'.freeze
+        MSG = 'Place the first line of module body on its own line.'
 
         def on_module(node)
           return unless trailing_body?(node)

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

@@ -37,7 +37,7 @@ module RuboCop
         include Alignment
 
         MSG = 'Place the end statement of a multi-line method on ' \
-              'its own line.'.freeze
+              'its own line.'
 
         def on_def(node)
           return unless trailing_end?(node)

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

@@ -27,8 +27,8 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Do not use trailing `_`s in parallel assignment. ' \
-              'Prefer `%<code>s`.'.freeze
-        UNDERSCORE = '_'.freeze
+              'Prefer `%<code>s`.'
+        UNDERSCORE = '_'
 
         def on_masgn(node)
           ranges = unneeded_ranges(node)

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

@@ -28,7 +28,7 @@ module RuboCop
       #     attr_reader :baz
       #   end
       class TrivialAccessors < Cop
-        MSG = 'Use `attr_%<kind>s` to define trivial %<kind>s methods.'.freeze
+        MSG = 'Use `attr_%<kind>s` to define trivial %<kind>s methods.'
 
         def on_def(node)
           return if top_level_node?(node)
@@ -41,7 +41,7 @@ module RuboCop
 
         def autocorrect(node)
           parent = node.parent
-          return if parent && parent.send_type?
+          return if parent&.send_type?
 
           if node.def_type?
             autocorrect_instance(node)

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

@@ -23,7 +23,7 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Do not use `unless` with `else`. Rewrite these with the ' \
-              'positive case first.'.freeze
+              'positive case first.'
 
         def on_if(node)
           return unless node.unless? && node.else?
@@ -36,7 +36,7 @@ module RuboCop
           else_range = range_between_else_and_end(node)
 
           lambda do |corrector|
-            corrector.replace(node.loc.keyword, 'if'.freeze)
+            corrector.replace(node.loc.keyword, 'if')
             corrector.replace(body_range, else_range.source)
             corrector.replace(else_range, body_range.source)
           end

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

@@ -18,7 +18,7 @@ module RuboCop
         include PercentLiteral
 
         MSG = 'Do not use `%W` unless interpolation is needed. ' \
-              'If not, use `%w`.'.freeze
+              'If not, use `%w`.'
 
         def on_array(node)
           process(node, '%W')

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

@@ -33,8 +33,8 @@ module RuboCop
       class UnneededCondition < Cop
         include RangeHelp
 
-        MSG = 'Use double pipes `||` instead.'.freeze
-        UNNEEDED_CONDITION = 'This condition is not needed.'.freeze
+        MSG = 'Use double pipes `||` instead.'
+        UNNEEDED_CONDITION = 'This condition is not needed.'
 
         def on_if(node)
           return if node.elsif_conditional?
@@ -86,7 +86,7 @@ module RuboCop
         end
 
         def use_if_branch?(else_branch)
-          else_branch && else_branch.if_type?
+          else_branch&.if_type?
         end
 
         def else_source(else_branch)
@@ -100,7 +100,7 @@ module RuboCop
           ternary_form = [if_branch.source,
                           else_source(else_branch)].join(' || ')
 
-          if node.parent && node.parent.send_type?
+          if node.parent&.send_type?
             "(#{ternary_form})"
           else
             ternary_form

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

@@ -18,7 +18,7 @@ module RuboCop
       class UnneededInterpolation < Cop
         include PercentLiteral
 
-        MSG = 'Prefer `to_s` over string interpolation.'.freeze
+        MSG = 'Prefer `to_s` over string interpolation.'
 
         def self.autocorrect_incompatible_with
           [Style::LineEndConcatenation]
@@ -62,11 +62,11 @@ module RuboCop
         end
 
         def implicit_concatenation?(node)
-          node.parent && node.parent.dstr_type?
+          node.parent&.dstr_type?
         end
 
         def embedded_in_percent_array?(node)
-          node.parent && node.parent.array_type? &&
+          node.parent&.array_type? &&
             percent_literal?(node.parent)
         end
 

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

@@ -19,14 +19,14 @@ module RuboCop
       #
       class UnneededPercentQ < Cop
         MSG = 'Use `%<q_type>s` only for strings that contain both ' \
-              'single quotes and double quotes%<extra>s.'.freeze
+              'single quotes and double quotes%<extra>s.'
         DYNAMIC_MSG = ', or for dynamic strings that contain ' \
-                      'double quotes'.freeze
-        SINGLE_QUOTE = "'".freeze
-        QUOTE = '"'.freeze
-        EMPTY = ''.freeze
-        PERCENT_Q = '%q'.freeze
-        PERCENT_CAPITAL_Q = '%Q'.freeze
+                      'double quotes'
+        SINGLE_QUOTE = "'"
+        QUOTE = '"'
+        EMPTY = ''
+        PERCENT_Q = '%q'
+        PERCENT_CAPITAL_Q = '%Q'
         STRING_INTERPOLATION_REGEXP = /#\{.+}/.freeze
         ESCAPED_NON_BACKSLASH = /\\[^\\]/.freeze
 

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

@@ -53,7 +53,7 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Use `%<suggestion>s` instead of '\
-              '`%<sorter>s...%<accessor_source>s`.'.freeze
+              '`%<sorter>s...%<accessor_source>s`.'
 
         def_node_matcher :unneeded_sort?, <<-MATCHER
           {
@@ -127,7 +127,7 @@ module RuboCop
         end
 
         def base(accessor, arg)
-          if accessor == :first || (arg && arg.zero?)
+          if accessor == :first || (arg&.zero?)
             'min'
           elsif accessor == :last || arg == -1
             'max'

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

@@ -23,7 +23,7 @@ module RuboCop
         minimum_target_ruby_version 2.4
 
         MSG = 'Use `%<receiver>s.unpack1(%<format>s)` instead of '\
-          '`%<receiver>s.unpack(%<format>s)%<method>s`.'.freeze
+          '`%<receiver>s.unpack(%<format>s)%<method>s`.'
 
         def_node_matcher :unpack_and_first_element?, <<-PATTERN
           {

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

@@ -17,7 +17,7 @@ module RuboCop
       #   "Let's go to the #{@store}"
       class VariableInterpolation < Cop
         MSG = 'Replace interpolated variable `%<variable>s` ' \
-              'with expression `#{%<variable>s}`.'.freeze
+              'with expression `#{%<variable>s}`.'
 
         def on_dstr(node)
           check_for_interpolation(node)

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

@@ -18,7 +18,7 @@ module RuboCop
       #   when 2 then 'bar'
       #   end
       class WhenThen < Cop
-        MSG = 'Do not use `when x;`. Use `when x then` instead.'.freeze
+        MSG = 'Do not use `when x;`. Use `when x then` instead.'
 
         def on_when(node)
           return if node.multiline? || node.then? || !node.body

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

@@ -29,7 +29,7 @@ module RuboCop
       #     do_something(x.pop)
       #   end
       class WhileUntilDo < Cop
-        MSG = 'Do not use `do` with multi-line `%<keyword>s`.'.freeze
+        MSG = 'Do not use `do` with multi-line `%<keyword>s`.'
 
         def on_while(node)
           handle(node)

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

@@ -28,7 +28,7 @@ module RuboCop
         include StatementModifier
 
         MSG = 'Favor modifier `%<keyword>s` usage when ' \
-              'having a single-line body.'.freeze
+              'having a single-line body.'
 
         def on_while(node)
           check(node)

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

@@ -33,8 +33,8 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include PercentArray
 
-        PERCENT_MSG = 'Use `%w` or `%W` for an array of words.'.freeze
-        ARRAY_MSG = 'Use `[]` for an array of words.'.freeze
+        PERCENT_MSG = 'Use `%w` or `%W` for an array of words.'
+        ARRAY_MSG = 'Use `[]` for an array of words.'
 
         class << self
           attr_accessor :largest_brackets

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

@@ -54,7 +54,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = 'Reverse the order of the operands `%<source>s`.'.freeze
+        MSG = 'Reverse the order of the operands `%<source>s`.'
 
         REVERSE_COMPARISON = {
           '<' => '>',

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

@@ -26,9 +26,9 @@ module RuboCop
       #   !string.empty?
       #   !hash.empty?
       class ZeroLengthPredicate < Cop
-        ZERO_MSG = 'Use `empty?` instead of `%<lhs>s %<opr>s %<rhs>s`.'.freeze
+        ZERO_MSG = 'Use `empty?` instead of `%<lhs>s %<opr>s %<rhs>s`.'
         NONZERO_MSG = 'Use `!empty?` instead of ' \
-                      '`%<lhs>s %<opr>s %<rhs>s`.'.freeze
+                      '`%<lhs>s %<opr>s %<rhs>s`.'
 
         def on_send(node)
           check_zero_length_predicate(node)

data/lib/rubocop/cop/util.rb

@@ -23,7 +23,7 @@ module RuboCop
 
       def parentheses?(node)
         node.loc.respond_to?(:end) && node.loc.end &&
-          node.loc.end.is?(')'.freeze)
+          node.loc.end.is?(')')
       end
 
       def on_node(syms, sexp, excludes = [], &block)
@@ -119,7 +119,7 @@ module RuboCop
       private
 
       def compatible_external_encoding_for?(src)
-        src = src.dup if RUBY_VERSION < '2.3' || RUBY_ENGINE == 'jruby'
+        src = src.dup if RUBY_ENGINE == 'jruby'
         src.force_encoding(Encoding.default_external).valid_encoding?
       end
     end

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

@@ -14,7 +14,7 @@ module RuboCop
         end
 
         def invoke_hook(hook_name, *args)
-          @hook_receiver.send(hook_name, *args) if @hook_receiver
+          @hook_receiver&.send(hook_name, *args)
         end
 
         def scope_stack

data/lib/rubocop/core_ext/string.rb

@@ -27,7 +27,7 @@ class String
     #
     # @example
     #
-    #   code = <<-END.strip_indent
+    #   code = <<~END
     #     def test
     #       some_method
     #       other_method

data/lib/rubocop/formatter/clang_style_formatter.rb

@@ -6,7 +6,7 @@ module RuboCop
     # The precise location of the problem is shown together with the
     # relevant source code.
     class ClangStyleFormatter < SimpleTextFormatter
-      ELLIPSES = '...'.freeze
+      ELLIPSES = '...'
 
       def report_file(file, offenses)
         offenses.each { |offense| report_offense(file, offense) }

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -5,7 +5,7 @@ module RuboCop
     # This formatter displays a YAML configuration file where all cops that
     # detected any offenses are configured to not detect the offense.
     class DisabledConfigFormatter < BaseFormatter
-      HEADING = <<-COMMENTS.strip_indent
+      HEADING = <<~COMMENTS
         # This configuration was generated by
         # `%<command>s`
         # %<timestamp>susing RuboCop version #{Version.version}.
@@ -121,7 +121,7 @@ module RuboCop
         end
 
         cop_class = Cop::Cop.registry.find_by_cop_name(cop_name)
-        if cop_class && cop_class.new.support_autocorrect?
+        if cop_class&.new&.support_autocorrect?
           output_buffer.puts '# Cop supports --auto-correct.'
         end
 

data/lib/rubocop/formatter/fuubar_style_formatter.rb

@@ -9,7 +9,7 @@ module RuboCop
     # This is inspired by the Fuubar formatter for RSpec by Jeff Kreeftmeijer.
     # https://github.com/jeffkreeftmeijer/fuubar
     class FuubarStyleFormatter < ClangStyleFormatter
-      RESET_SEQUENCE = "\e[0m".freeze
+      RESET_SEQUENCE = "\e[0m"
 
       def initialize(*output)
         @severest_offense = nil

data/lib/rubocop/formatter/html_formatter.rb

@@ -10,7 +10,7 @@ module RuboCop
   module Formatter
     # This formatter saves the output as an html file.
     class HTMLFormatter < BaseFormatter
-      ELLIPSES = '<span class="extra-code">...</span>'.freeze
+      ELLIPSES = '<span class="extra-code">...</span>'
       TEMPLATE_PATH =
         File.expand_path('../../../assets/output.html.erb', __dir__)
 

data/lib/rubocop/formatter/progress_formatter.rb

@@ -8,7 +8,7 @@ module RuboCop
     class ProgressFormatter < ClangStyleFormatter
       include TextUtil
 
-      DOT = '.'.freeze
+      DOT = '.'
 
       def initialize(output, options = {})
         super

data/lib/rubocop/formatter/simple_text_formatter.rb

@@ -92,7 +92,7 @@ module RuboCop
         end
 
         def summary
-          if @correction_count > 0
+          if @correction_count.positive?
             "#{files} inspected, #{offenses} detected, #{corrections} corrected"
           else
             "#{files} inspected, #{offenses} detected"

data/lib/rubocop/magic_comment.rb

@@ -130,8 +130,8 @@ module RuboCop
     # @see https://git.io/vMCXh Emacs handling in Ruby's parse.y
     class EmacsComment < EditorComment
       FORMAT    = /\-\*\-(.+)\-\*\-/.freeze
-      SEPARATOR = ';'.freeze
-      OPERATOR  = ':'.freeze
+      SEPARATOR = ';'
+      OPERATOR  = ':'
 
       def encoding
         match('(?:en)?coding')
@@ -154,8 +154,8 @@ module RuboCop
     #   comment.encoding # => 'ascii-8bit'
     class VimComment < EditorComment
       FORMAT    = /#\s*vim:\s*(.+)/.freeze
-      SEPARATOR = ', '.freeze
-      OPERATOR  = '='.freeze
+      SEPARATOR = ', '
+      OPERATOR  = '='
 
       # For some reason the fileencoding keyword only works if there
       # is at least one other token included in the string. For example

data/lib/rubocop/node_pattern.rb

@@ -127,21 +127,21 @@ module RuboCop
       PARAM     = /\A#{PARAM_NUMBER}\Z/.freeze
       CLOSING   = /\A(?:\)|\}|\])\Z/.freeze
 
-      REST      = '...'.freeze
-      CAPTURED_REST = '$...'.freeze
+      REST      = '...'
+      CAPTURED_REST = '$...'
 
       attr_reader :match_code, :tokens, :captures
 
       SEQ_HEAD_INDEX = -1
 
       # Placeholders while compiling, see with_..._context methods
-      CUR_PLACEHOLDER = '@@@cur'.freeze
-      CUR_NODE = "#{CUR_PLACEHOLDER} node@@@".freeze
-      CUR_ELEMENT = "#{CUR_PLACEHOLDER} element@@@".freeze
-      SEQ_HEAD_GUARD = '@@@seq guard head@@@'.freeze
+      CUR_PLACEHOLDER = '@@@cur'
+      CUR_NODE = "#{CUR_PLACEHOLDER} node@@@"
+      CUR_ELEMENT = "#{CUR_PLACEHOLDER} element@@@"
+      SEQ_HEAD_GUARD = '@@@seq guard head@@@'
 
       line = __LINE__
-      ANY_ORDER_TEMPLATE = ERB.new <<-RUBY.strip_indent.gsub("-%>\n", '%>')
+      ANY_ORDER_TEMPLATE = ERB.new <<~RUBY.gsub("-%>\n", '%>')
         <% if capture_rest %>(<%= capture_rest %> = []) && <% end -%>
         <% if capture_all %>(<%= capture_all %> = <% end -%>
         <%= CUR_NODE %>.children[<%= range %>]<% if capture_all %>)<% end -%>
@@ -176,7 +176,7 @@ module RuboCop
 
         @match_code = with_context(compile_expr, node_var, use_temp_node: false)
         @match_code.prepend("(captures = Array.new(#{@captures})) && ") \
-          if @captures > 0
+          if @captures.positive?
 
         fail_due_to('unbalanced pattern') unless tokens.empty?
       end
@@ -334,7 +334,7 @@ module RuboCop
         def variadic_arity
           return unless @variadic_index
 
-          first = @variadic_index > 0 ? first_terms_arity : SEQ_HEAD_INDEX
+          first = @variadic_index.positive? ? first_terms_arity : SEQ_HEAD_INDEX
           yield first..-last_terms_arity - 1
         end
       end