rubocop 0.68.1 → 0.69.0

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

@@ -72,7 +72,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = 'Indent `when` %<depth>s `%<base>s`.'.freeze
+        MSG = 'Indent `when` %<depth>s `%<base>s`.'
 
         def on_case(case_node)
           return if case_node.single_line?

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

@@ -140,7 +140,7 @@ module RuboCop
 
         VISIBILITY_SCOPES = %i[private protected public].freeze
         MSG = '`%<category>s` is supposed to appear before ' \
-              '`%<previous>s`.'.freeze
+              '`%<previous>s`.'
 
         def_node_matcher :visibility_block?, <<-PATTERN
           (send nil? { :private :protected :public })
@@ -242,7 +242,7 @@ module RuboCop
 
         def node_visibility(node)
           scope = find_visibility_start(node)
-          scope && scope.method_name || :public
+          scope&.method_name || :public
         end
 
         def find_visibility_start(node)

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

@@ -49,10 +49,10 @@ module RuboCop
       class ClosingHeredocIndentation < Cop
         include Heredoc
 
-        SIMPLE_HEREDOC = '<<'.freeze
-        MSG = '`%<closing>s` is not aligned with `%<opening>s`.'.freeze
+        SIMPLE_HEREDOC = '<<'
+        MSG = '`%<closing>s` is not aligned with `%<opening>s`.'
         MSG_ARG = '`%<closing>s` is not aligned with `%<opening>s` or ' \
-                  'beginning of method definition.'.freeze
+                  'beginning of method definition.'
 
         def on_heredoc(node)
           return if heredoc_type(node) == SIMPLE_HEREDOC ||
@@ -102,7 +102,7 @@ module RuboCop
         end
 
         def find_node_used_heredoc_argument(node)
-          if node.parent && node.parent.send_type?
+          if node.parent&.send_type?
             find_node_used_heredoc_argument(node.parent)
           else
             node

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

@@ -72,8 +72,8 @@ module RuboCop
         include Alignment
 
         MSG_INDENT = 'Indent `)` to column %<expected>d (not %<actual>d)'
-                     .freeze
-        MSG_ALIGN = 'Align `)` with `(`.'.freeze
+
+        MSG_ALIGN = 'Align `)` with `(`.'
 
         def on_send(node)
           check(node, node.arguments)
@@ -148,7 +148,7 @@ module RuboCop
                             .line_indentation(first_argument_line(elements))
             new_indent    = source_indent - indentation_width
 
-            new_indent < 0 ? 0 : new_indent
+            new_indent.negative? ? 0 : new_indent
           elsif all_elements_aligned?(elements)
             left_paren.column
           else

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

@@ -36,7 +36,7 @@ module RuboCop
         include Alignment
 
         MSG = 'Incorrect indentation detected (column %<column>d ' \
-          'instead of %<correct_comment_indentation>d).'.freeze
+          'instead of %<correct_comment_indentation>d).'
 
         def investigate(processed_source)
           processed_source.each_comment { |comment| check(comment) }

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

@@ -23,7 +23,7 @@ module RuboCop
       #     do_something
       #   end
       class ConditionPosition < Cop
-        MSG = 'Place the condition on the same line as `%<keyword>s`.'.freeze
+        MSG = 'Place the condition on the same line as `%<keyword>s`.'
 
         def on_if(node)
           return if node.ternary?

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

@@ -37,7 +37,7 @@ module RuboCop
         include EndKeywordAlignment
         include RangeHelp
 
-        MSG = '`end` at %d, %d is not aligned with `%s` at %d, %d.'.freeze
+        MSG = '`end` at %d, %d is not aligned with `%s` at %d, %d.'
 
         def on_def(node)
           check_end_kw_in_node(node)

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

@@ -34,7 +34,7 @@ module RuboCop
         include Alignment
         include CheckAssignment
 
-        MSG = 'Align `%<else_range>s` with `%<base_range>s`.'.freeze
+        MSG = 'Align `%<else_range>s` with `%<base_range>s`.'
 
         def on_if(node, base = nil)
           return if ignored_node?(node)
@@ -92,7 +92,7 @@ module RuboCop
 
         def base_for_method_definition(node)
           parent = node.parent
-          if parent && parent.send_type?
+          if parent&.send_type?
             parent.loc.selector # For example "private def ..."
           else
             node.loc.keyword

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

@@ -63,7 +63,7 @@ module RuboCop
       class EmptyComment < Cop
         include RangeHelp
 
-        MSG = 'Source code comment is empty.'.freeze
+        MSG = 'Source code comment is empty.'
 
         def investigate(processed_source)
           if allow_margin_comment?

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

@@ -38,7 +38,7 @@ module RuboCop
       class EmptyLineAfterGuardClause < Cop
         include RangeHelp
 
-        MSG = 'Add empty line after guard clause.'.freeze
+        MSG = 'Add empty line after guard clause.'
         END_OF_HEREDOC_LINE = 1
 
         def on_if(node)
@@ -79,7 +79,7 @@ module RuboCop
         end
 
         def contains_guard_clause?(node)
-          node.if_branch && node.if_branch.guard_clause?
+          node.if_branch&.guard_clause?
         end
 
         def next_line_empty?(line)
@@ -97,7 +97,7 @@ module RuboCop
 
           parent = next_sibling.parent
 
-          parent && parent.if_type? && parent.else?
+          parent&.if_type? && parent&.else?
         end
 
         def next_sibling_empty_or_guard_clause?(node)
@@ -110,7 +110,7 @@ module RuboCop
         def last_argument_is_heredoc?(node)
           last_children = node.if_branch
 
-          return false unless last_children && last_children.send_type?
+          return false unless last_children&.send_type?
 
           last_argument = last_argument(node)
 
@@ -130,7 +130,7 @@ module RuboCop
         end
 
         def offense_location(node)
-          if node.loc && node.loc.end
+          if node.loc.respond_to?(:end) && node.loc.end
             :end
           else
             :expression

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

@@ -23,7 +23,7 @@ module RuboCop
       class EmptyLineAfterMagicComment < Cop
         include RangeHelp
 
-        MSG = 'Add an empty line after magic comments.'.freeze
+        MSG = 'Add an empty line after magic comments.'
 
         def investigate(source)
           return unless source.ast &&

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

@@ -32,7 +32,7 @@ module RuboCop
       class EmptyLineBetweenDefs < Cop
         include RangeHelp
 
-        MSG = 'Use empty lines between method definitions.'.freeze
+        MSG = 'Use empty lines between method definitions.'
 
         def self.autocorrect_incompatible_with
           [Layout::EmptyLines]
@@ -111,7 +111,7 @@ module RuboCop
         end
 
         def prev_node(node)
-          return nil unless node.sibling_index > 0
+          return nil unless node.sibling_index.positive?
 
           node.parent.children[node.sibling_index - 1]
         end

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

@@ -23,7 +23,7 @@ module RuboCop
       class EmptyLines < Cop
         include RangeHelp
 
-        MSG = 'Extra blank line detected.'.freeze
+        MSG = 'Extra blank line detected.'
         LINE_OFFSET = 2
 
         def investigate(processed_source)

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

@@ -25,9 +25,9 @@ module RuboCop
       class EmptyLinesAroundAccessModifier < Cop
         include RangeHelp
 
-        MSG_AFTER = 'Keep a blank line after `%<modifier>s`.'.freeze
+        MSG_AFTER = 'Keep a blank line after `%<modifier>s`.'
         MSG_BEFORE_AND_AFTER = 'Keep a blank line before and after ' \
-                               '`%<modifier>s`.'.freeze
+                               '`%<modifier>s`.'
 
         def initialize(config = nil, options = nil)
           super

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

@@ -41,7 +41,7 @@ module RuboCop
       class EmptyLinesAroundArguments < Cop
         include RangeHelp
 
-        MSG = 'Empty line detected around arguments.'.freeze
+        MSG = 'Empty line detected around arguments.'
 
         def on_send(node)
           return if node.single_line? || node.arguments.empty?

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

@@ -24,7 +24,7 @@ module RuboCop
       class EmptyLinesAroundBeginBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = '`begin`'.freeze
+        KIND = '`begin`'
 
         def on_kwbegin(node)
           check(node, nil)

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

@@ -24,7 +24,7 @@ module RuboCop
       class EmptyLinesAroundBlockBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = 'block'.freeze
+        KIND = 'block'
 
         def on_block(node)
           check(node, node.body)

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

@@ -67,7 +67,7 @@ module RuboCop
       class EmptyLinesAroundClassBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = 'class'.freeze
+        KIND = 'class'
 
         def on_class(node)
           first_line = node.parent_class.first_line if node.parent_class

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

@@ -61,7 +61,7 @@ module RuboCop
       class EmptyLinesAroundExceptionHandlingKeywords < Cop
         include EmptyLinesAroundBody
 
-        MSG = 'Extra empty line detected %<location>s the `%<keyword>s`.'.freeze
+        MSG = 'Extra empty line detected %<location>s the `%<keyword>s`.'
 
         def on_def(node)
           check_body(node.body)

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

@@ -23,7 +23,7 @@ module RuboCop
       class EmptyLinesAroundMethodBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = 'method'.freeze
+        KIND = 'method'
 
         def on_def(node)
           check(node, node.body)

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

@@ -47,7 +47,7 @@ module RuboCop
       class EmptyLinesAroundModuleBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = 'module'.freeze
+        KIND = 'module'
 
         def on_module(node)
           check(node, node.body)

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

@@ -41,8 +41,8 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG_DETECTED = 'Carriage return character detected.'.freeze
-        MSG_MISSING = 'Carriage return character missing.'.freeze
+        MSG_DETECTED = 'Carriage return character detected.'
+        MSG_MISSING = 'Carriage return character missing.'
 
         def investigate(processed_source)
           last_token = processed_source.tokens.last

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

@@ -34,9 +34,9 @@ module RuboCop
         include PrecedingFollowingAlignment
         include RangeHelp
 
-        MSG_UNNECESSARY = 'Unnecessary spacing detected.'.freeze
+        MSG_UNNECESSARY = 'Unnecessary spacing detected.'
         MSG_UNALIGNED_ASGN = '`=` is not aligned with the %<location>s ' \
-                             'assignment.'.freeze
+                             'assignment.'
 
         def investigate(processed_source)
           return if processed_source.blank?
@@ -171,7 +171,7 @@ module RuboCop
         end
 
         def aligned_with_previous_comment?(index)
-          index > 0 && comment_column(index - 1) == comment_column(index)
+          index.positive? && comment_column(index - 1) == comment_column(index)
         end
 
         def aligned_with_next_comment?(index)
@@ -202,9 +202,9 @@ module RuboCop
 
           diff = align_to - token.pos.last_column
 
-          if diff > 0
+          if diff.positive?
             corrector.insert_before(token.pos, ' ' * diff)
-          elsif diff < 0
+          elsif diff.negative?
             corrector.remove_preceding(token.pos, -diff)
           end
         end

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

@@ -21,7 +21,7 @@ module RuboCop
         include FirstElementLineBreak
 
         MSG = 'Add a line break before the first element of a ' \
-              'multi-line array.'.freeze
+              'multi-line array.'
 
         def on_array(node)
           return if !node.loc.begin && !assignment_on_same_line?(node)

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

@@ -20,7 +20,7 @@ module RuboCop
         include FirstElementLineBreak
 
         MSG = 'Add a line break before the first element of a ' \
-              'multi-line hash.'.freeze
+              'multi-line hash.'
 
         def on_hash(node)
           # node.loc.begin tells us whether the hash opens with a {

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

@@ -24,7 +24,7 @@ module RuboCop
         include FirstElementLineBreak
 
         MSG = 'Add a line break before the first argument of a ' \
-              'multi-line method argument list.'.freeze
+              'multi-line method argument list.'
 
         def on_send(node)
           args = node.arguments

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

@@ -30,7 +30,7 @@ module RuboCop
         include FirstElementLineBreak
 
         MSG = 'Add a line break before the first parameter of a ' \
-              'multi-line method parameter list.'.freeze
+              'multi-line method parameter list.'
 
         def on_def(node)
           check_method_line_break(node, node.arguments)

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

@@ -54,9 +54,8 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Put the closing parenthesis for a method call with a ' \
-        'HEREDOC parameter on the same line as the HEREDOC opening.'.freeze
+        'HEREDOC parameter on the same line as the HEREDOC opening.'
 
-        STRING_TYPES = %i[str dstr xstr].freeze
         def on_send(node)
           heredoc_arg = extract_heredoc_argument(node)
           return unless heredoc_arg
@@ -123,18 +122,12 @@ module RuboCop
         end
 
         def send_missing_closing_parens?(parent, child, heredoc)
-          send_node?(parent) &&
+          parent&.call_type? &&
             parent.arguments.include?(child) &&
             parent.loc.begin &&
             parent.loc.end.line != heredoc.last_line
         end
 
-        def send_node?(node)
-          return nil unless node
-
-          node.send_type? || node.csend_type?
-        end
-
         def extract_heredoc_argument(node)
           node.arguments.find do |arg_node|
             extract_heredoc(arg_node)
@@ -154,7 +147,7 @@ module RuboCop
         end
 
         def heredoc_node?(node)
-          node && STRING_TYPES.include?(node.type) && node.heredoc?
+          node.respond_to?(:heredoc?) && node.heredoc?
         end
 
         def single_line_send_with_heredoc_receiver?(node)

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

@@ -26,7 +26,7 @@ module RuboCop
         include Alignment
 
         MSG = 'Indent the first line of the right-hand-side of a ' \
-              'multi-line assignment.'.freeze
+              'multi-line assignment.'
 
         def check_assignment(node, rhs)
           return unless rhs

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

@@ -144,7 +144,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = 'Indent the first argument one step more than %<base>s.'.freeze
+        MSG = 'Indent the first argument one step more than %<base>s.'
 
         def on_send(node)
           return if !node.arguments? || node.operator_method?

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

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