rubocop 1.12.0 → 1.13.0

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

@@ -41,9 +41,7 @@ module RuboCop
       end
 
       def correct_next_line_brace(corrector)
-        corrector.remove(
-          range_with_surrounding_space(range: node.loc.end, side: :left)
-        )
+        corrector.remove(range_with_surrounding_space(range: node.loc.end, side: :left))
 
         corrector.insert_before(
           last_element_range_with_trailing_comma(node).end,

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

@@ -17,9 +17,7 @@ module RuboCop
           current_range = declaration_with_comment(node)
           previous_range = declaration_with_comment(previous_declaration)
 
-          lambda do |corrector|
-            swap_range(corrector, current_range, previous_range)
-          end
+          ->(corrector) do swap_range(corrector, current_range, previous_range) end
         end
 
         private

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

@@ -32,9 +32,7 @@ module RuboCop
       end
 
       def delimiters_for(type)
-        PreferredDelimiters
-          .new(type, config, preferred_delimiters)
-          .delimiters
+        PreferredDelimiters.new(type, config, preferred_delimiters).delimiters
       end
 
       def new_contents(node, escape, delimiters)
@@ -61,11 +59,7 @@ module RuboCop
         base_line_num = node.first_line
         prev_line_num = base_line_num
         node.children.map.with_index do |word_node, index|
-          line_breaks = line_breaks(word_node,
-                                    node.source,
-                                    prev_line_num,
-                                    base_line_num,
-                                    index)
+          line_breaks = line_breaks(word_node, node.source, prev_line_num, base_line_num, index)
           prev_line_num = word_node.last_line
           content = fix_escaped_content(word_node, escape, delimiters)
           line_breaks + content

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

@@ -91,8 +91,7 @@ module RuboCop
 
         def register_offense(node, assignment, line_of_first_occurrence)
           line_range = node.loc.column...node.loc.last_column
-          offense_location =
-            source_range(processed_source.buffer, node.first_line, line_range)
+          offense_location = source_range(processed_source.buffer, node.first_line, line_range)
           message = format(
             MSG,
             assignment: assignment,

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

@@ -64,10 +64,7 @@ module RuboCop
           dependency_declarations(processed_source.ast)
             .each_cons(2) do |previous, current|
             next unless consecutive_lines(previous, current)
-            next unless case_insensitive_out_of_order?(
-              gem_name(current),
-              gem_name(previous)
-            )
+            next unless case_insensitive_out_of_order?(gem_name(current), gem_name(previous))
             next unless get_dependency_name(previous) == get_dependency_name(current)
 
             register_offense(previous, current)

data/lib/rubocop/cop/generator.rb

@@ -124,10 +124,7 @@ module RuboCop
       end
 
       def inject_require(root_file_path: 'lib/rubocop.rb')
-        RequireFileInjector.new(
-          source_path: source_path,
-          root_file_path: root_file_path
-        ).inject
+        RequireFileInjector.new(source_path: source_path, root_file_path: root_file_path).inject
       end
 
       def inject_config(config_file_path: 'config/default.yml',

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

@@ -24,8 +24,7 @@ module RuboCop
         def inject
           target_line = find_target_line
           if target_line
-            configuration_entries.insert(target_line,
-                                         "#{new_configuration_entry}\n")
+            configuration_entries.insert(target_line, "#{new_configuration_entry}\n")
           else
             configuration_entries.push("\n#{new_configuration_entry}")
           end

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

@@ -29,14 +29,11 @@ module RuboCop
         attr_reader :require_entries, :root_file_path, :source_path, :output
 
         def require_exists?
-          require_entries.any? do |entry|
-            entry == injectable_require_directive
-          end
+          require_entries.any?(injectable_require_directive)
         end
 
         def updated_directives
-          require_entries.insert(target_line,
-                                 injectable_require_directive).join
+          require_entries.insert(target_line, injectable_require_directive).join
         end
 
         def target_line

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

@@ -49,9 +49,7 @@ module RuboCop
           /^(does not|doesn't) add (a|an|any )?offense/
         ].freeze
 
-        EXPECT_NO_CORRECTIONS_INCORRECT_DESCRIPTIONS = [
-          /^(auto[- ]?)?correct/
-        ].freeze
+        EXPECT_NO_CORRECTIONS_INCORRECT_DESCRIPTIONS = [/^(auto[- ]?)?correct/].freeze
 
         EXPECT_CORRECTION_INCORRECT_DESCRIPTIONS = [
           /\b(does not|doesn't) (auto[- ]?)?correct/
@@ -80,10 +78,14 @@ module RuboCop
         private
 
         def check_description(description, regexps, message)
-          return unless regexps.any? { |regexp| regexp.match?(description.value) }
+          return unless regexps.any? { |regexp| regexp.match?(string_contents(description)) }
 
           add_offense(description, message: message)
         end
+
+        def string_contents(node)
+          node.str_type? ? node.value : node.source
+        end
       end
     end
   end

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

@@ -16,8 +16,7 @@ module RuboCop
         include RangeHelp
         extend AutoCorrector
 
-        MSG = 'Use `method?(%<method_name>s)` instead of ' \
-              '`method_name == %<method_name>s`.'
+        MSG = 'Use `method?(%<method_name>s)` instead of `method_name == %<method_name>s`.'
         RESTRICT_ON_SEND = %i[==].freeze
 
         # @!method method_name?(node)
@@ -43,9 +42,7 @@ module RuboCop
         private
 
         def range(method_name_node, node)
-          range_between(
-            method_name_node.loc.selector.begin_pos, node.source_range.end_pos
-          )
+          range_between(method_name_node.loc.selector.begin_pos, node.source_range.end_pos)
         end
       end
     end

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

@@ -30,9 +30,7 @@ module RuboCop
         PATTERN
 
         def on_masgn(node)
-          node_destructuring?(node) do
-            add_offense(node)
-          end
+          node_destructuring?(node) { add_offense(node) }
         end
 
         private

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

@@ -30,9 +30,7 @@ module RuboCop
 
             message = format(MSG, type: node_type)
             add_offense(node, message: message) do |corrector|
-              range = node.loc.expression.with(
-                begin_pos: receiver.loc.expression.end_pos + 1
-              )
+              range = node.loc.expression.with(begin_pos: receiver.loc.expression.end_pos + 1)
               corrector.replace(range, "#{node_type}_type?")
             end
           end

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

@@ -16,8 +16,7 @@ module RuboCop
       class OffenseLocationKeyword < Base
         extend AutoCorrector
 
-        MSG = 'Use `:%<keyword>s` as the location argument to ' \
-              '`#add_offense`.'
+        MSG = 'Use `:%<keyword>s` as the location argument to `#add_offense`.'
         RESTRICT_ON_SEND = %i[add_offense].freeze
 
         def on_send(node)

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

@@ -58,8 +58,7 @@ module RuboCop
         MSG_FOR_NEGATIVE_WITHOUT_POSITIVE =
           'negative `*_style_detected` methods called without ' \
           'calling `correct_style_detected` method.'
-        MSG_FOR_CONDITIONAL_USE =
-          '`*_style_detected` method called in conditional.'
+        MSG_FOR_CONDITIONAL_USE = '`*_style_detected` method called in conditional.'
         RESTRICT_ON_SEND = %i[
           correct_style_detected opposite_style_detected
           unexpected_style_detected ambiguous_style_detected

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

@@ -27,9 +27,7 @@ module RuboCop
         PATTERN
 
         def on_new_investigation
-          assertions_using_described_class_msg.each do |node|
-            add_offense(node)
-          end
+          assertions_using_described_class_msg.each { |node| add_offense(node) }
         end
 
         private

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

@@ -56,8 +56,7 @@ module RuboCop
         end
 
         def check_body(body, node)
-          modifiers = body.each_child_node(:send)
-                          .select(&:bare_access_modifier?)
+          modifiers = body.each_child_node(:send).select(&:bare_access_modifier?)
           end_range = node.loc.end
 
           modifiers.each { |modifier| check_modifier(modifier, end_range) }

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

@@ -41,15 +41,13 @@ module RuboCop
         include Alignment
         extend AutoCorrector
 
-        ALIGN_PARAMS_MSG = 'Align the arguments of a method call if ' \
-          'they span more than one line.'
+        ALIGN_PARAMS_MSG = 'Align the arguments of a method call if 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.'
 
         def on_send(node)
-          return if node.arguments.size < 2 ||
-                    node.send_type? && node.method?(:[]=)
+          return if node.arguments.size < 2 || node.send_type? && node.method?(:[]=)
 
           check_alignment(node.arguments, base_column(node, node.arguments))
         end

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

@@ -26,8 +26,7 @@ module RuboCop
         include Alignment
         extend AutoCorrector
 
-        MSG = 'Indent the first line of the right-hand-side of a ' \
-              'multi-line assignment.'
+        MSG = 'Indent the first line of the right-hand-side of a multi-line assignment.'
 
         private
 
@@ -45,8 +44,7 @@ module RuboCop
         end
 
         def leftmost_multiple_assignment(node)
-          return node unless same_line?(node, node.parent) &&
-                             node.parent.assignment?
+          return node unless same_line?(node, node.parent) && node.parent.assignment?
 
           leftmost_multiple_assignment(node.parent)
 

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

@@ -52,10 +52,7 @@ module RuboCop
         private
 
         def check_begin_alignment(node)
-          align_with = {
-            begin: node.loc.begin,
-            start_of_line: start_line_range(node)
-          }
+          align_with = { begin: node.loc.begin, start_of_line: start_line_range(node) }
           check_end_kw_alignment(node, align_with)
         end
 

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

@@ -109,13 +109,11 @@ module RuboCop
         end
 
         def end_align_target?(node, parent)
-          disqualified_parent?(parent, node) ||
-            !block_end_align_target?(parent, node)
+          disqualified_parent?(parent, node) || !block_end_align_target?(parent, node)
         end
 
         def disqualified_parent?(parent, node)
-          parent&.loc && parent.first_line != node.first_line &&
-            !parent.masgn_type?
+          parent&.loc && parent.first_line != node.first_line && !parent.masgn_type?
         end
 
         def check_block_alignment(start_node, block_node)
@@ -123,19 +121,12 @@ module RuboCop
           return unless begins_its_line?(end_loc)
 
           start_loc = start_node.source_range
-          return unless start_loc.column != end_loc.column ||
-                        style == :start_of_block
+          return unless start_loc.column != end_loc.column || style == :start_of_block
 
-          do_source_line_column =
-            compute_do_source_line_column(block_node, end_loc)
+          do_source_line_column = compute_do_source_line_column(block_node, end_loc)
           return unless do_source_line_column
 
-          register_offense(
-            block_node,
-            start_loc,
-            end_loc,
-            do_source_line_column
-          )
+          register_offense(block_node, start_loc, end_loc, do_source_line_column)
         end
 
         def register_offense(block_node,
@@ -174,9 +165,7 @@ module RuboCop
                            error_source_line_column)
           format(
             MSG,
-            current: format_source_line_column(
-              loc_to_source_line_column(end_loc)
-            ),
+            current: format_source_line_column(loc_to_source_line_column(end_loc)),
             prefer: format_source_line_column(error_source_line_column),
             alt_prefer: alt_start_msg(start_loc, do_source_line_column)
           )
@@ -192,8 +181,7 @@ module RuboCop
           # blocks.
           match = /\S.*/.match(do_loc.source_line)
           indentation_of_do_line = match.begin(0)
-          return unless end_loc.column != indentation_of_do_line ||
-                        style == :start_of_line
+          return unless end_loc.column != indentation_of_do_line || style == :start_of_line
 
           {
             source: match[0],

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

@@ -78,9 +78,7 @@ module RuboCop
         def on_case(case_node)
           return if case_node.single_line?
 
-          case_node.each_when do |when_node|
-            check_when(when_node)
-          end
+          case_node.each_when { |when_node| check_when(when_node) }
         end
 
         private

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

@@ -144,8 +144,7 @@ module RuboCop
           sclass: :class_singleton
         }.freeze
 
-        MSG = '`%<category>s` is supposed to appear before ' \
-              '`%<previous>s`.'
+        MSG = '`%<category>s` is supposed to appear before `%<previous>s`.'
 
         # @!method dynamic_constant?(node)
         def_node_matcher :dynamic_constant?, <<~PATTERN
@@ -159,11 +158,8 @@ module RuboCop
           walk_over_nested_class_definition(class_node) do |node, category|
             index = expected_order.index(category)
             if index < previous
-              message = format(MSG, category: category,
-                                    previous: expected_order[previous])
-              add_offense(node, message: message) do |corrector|
-                autocorrect(corrector, node)
-              end
+              message = format(MSG, category: category, previous: expected_order[previous])
+              add_offense(node, message: message) { |corrector| autocorrect(corrector, node) }
             end
             previous = index
           end
@@ -254,9 +250,7 @@ module RuboCop
           classification = classify(node)
           sibling_class = classify(sibling)
 
-          ignore?(sibling_class) ||
-            classification == sibling_class ||
-            dynamic_constant?(node)
+          ignore?(sibling_class) || classification == sibling_class || dynamic_constant?(node)
         end
 
         def humanize_node(node)

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

@@ -143,8 +143,7 @@ module RuboCop
 
         def expected_column(left_paren, elements)
           if line_break_after_left_paren?(left_paren, elements)
-            source_indent = processed_source
-                            .line_indentation(first_argument_line(elements))
+            source_indent = processed_source.line_indentation(first_argument_line(elements))
             new_indent    = source_indent - indentation_width
 
             new_indent.negative? ? 0 : new_indent
@@ -156,17 +155,11 @@ module RuboCop
         end
 
         def all_elements_aligned?(elements)
-          elements
-            .map { |e| e.loc.column }
-            .uniq
-            .count == 1
+          elements.map { |e| e.loc.column }.uniq.count == 1
         end
 
         def first_argument_line(elements)
-          elements
-            .first
-            .loc
-            .first_line
+          elements.first.loc.first_line
         end
 
         def correct_column_candidates(node, left_paren)
@@ -181,11 +174,7 @@ module RuboCop
           if correct_column == left_paren.column
             MSG_ALIGN
           else
-            format(
-              MSG_INDENT,
-              expected: correct_column,
-              actual: right_paren.column
-            )
+            format(MSG_INDENT, expected: correct_column, actual: right_paren.column)
           end
         end
 

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

@@ -100,11 +100,7 @@ module RuboCop
         end
 
         def message(column, correct_comment_indentation)
-          format(
-            MSG,
-            column: column,
-            correct_comment_indentation: correct_comment_indentation
-          )
+          format(MSG, column: column, correct_comment_indentation: correct_comment_indentation)
         end
 
         def own_line_comment?(comment)