rubocop 1.12.0 → 1.16.0

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)

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

@@ -51,12 +51,8 @@ module RuboCop
           method_def = node.each_descendant(:def, :defs).first
           expr = node.source_range
 
-          line_start = range_between(expr.begin_pos,
-                                     method_def.loc.keyword.end_pos)
-          align_with = {
-            def: method_def.loc.keyword,
-            start_of_line: line_start
-          }
+          line_start = range_between(expr.begin_pos, method_def.loc.keyword.end_pos)
+          align_with = { def: method_def.loc.keyword, start_of_line: line_start }
 
           check_end_kw_alignment(method_def, align_with)
           ignore_node(method_def) # Don't check the same `end` again.

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

@@ -35,9 +35,7 @@ module RuboCop
           dot = node.loc.dot
           message = message(dot)
 
-          add_offense(dot, message: message) do |corrector|
-            autocorrect(corrector, dot, node)
-          end
+          add_offense(dot, message: message) { |corrector| autocorrect(corrector, dot, node) }
         end
         alias on_csend on_send
 

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

@@ -63,9 +63,7 @@ module RuboCop
         def on_case_match(node)
           return unless node.else?
 
-          check_alignment(
-            node.in_pattern_branches.last.loc.keyword, node.loc.else
-          )
+          check_alignment(node.in_pattern_branches.last.loc.keyword, node.loc.else)
         end
 
         private

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

@@ -75,9 +75,7 @@ module RuboCop
             processed_source.comments.each do |comment|
               next unless empty_comment_only?(comment_text(comment))
 
-              add_offense(comment) do |corrector|
-                autocorrect(corrector, comment)
-              end
+              add_offense(comment) { |corrector| autocorrect(corrector, comment) }
             end
           end
         end
@@ -99,19 +97,16 @@ module RuboCop
         def autocorrect(corrector, node)
           previous_token = previous_token(node)
           range = if previous_token && node.loc.line == previous_token.line
-                    range_with_surrounding_space(range: node.loc.expression,
-                                                 newlines: false)
+                    range_with_surrounding_space(range: node.loc.expression, newlines: false)
                   else
-                    range_by_whole_lines(node.loc.expression,
-                                         include_final_newline: true)
+                    range_by_whole_lines(node.loc.expression, include_final_newline: true)
                   end
 
           corrector.remove(range)
         end
 
         def concat_consecutive_comments(comments)
-          consecutive_comments =
-            comments.chunk_while { |i, j| i.loc.line.succ == j.loc.line }
+          consecutive_comments = comments.chunk_while { |i, j| i.loc.line.succ == j.loc.line }
 
           consecutive_comments.map do |chunk|
             joined_text = chunk.map { |c| comment_text(c) }.join
@@ -142,9 +137,7 @@ module RuboCop
         end
 
         def current_token(comment)
-          processed_source.find_token do |token|
-            token.pos == comment.loc.expression
-          end
+          processed_source.find_token { |token| token.pos == comment.loc.expression }
         end
 
         def previous_token(node)

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

@@ -47,18 +47,15 @@ module RuboCop
 
           if node.modifier_form? && last_argument_is_heredoc?(node)
             heredoc_node = last_heredoc_argument(node)
-
-            return if next_line_empty?(heredoc_line(node, heredoc_node))
+            return if next_line_empty_or_enable_directive_comment?(heredoc_line(node, heredoc_node))
 
             add_offense(heredoc_node.loc.heredoc_end) do |corrector|
               autocorrect(corrector, heredoc_node)
             end
           else
-            return if next_line_empty?(node.last_line)
+            return if next_line_empty_or_enable_directive_comment?(node.last_line)
 
-            add_offense(offense_location(node)) do |corrector|
-              autocorrect(corrector, node)
-            end
+            add_offense(offense_location(node)) { |corrector| autocorrect(corrector, node) }
           end
         end
 
@@ -71,6 +68,11 @@ module RuboCop
                          range_by_whole_lines(node.source_range)
                        end
 
+          next_line = node_range.last_line + 1
+          if next_line_enable_directive_comment?(next_line)
+            node_range = processed_source.comment_at_line(next_line)
+          end
+
           corrector.insert_after(node_range, "\n")
         end
 
@@ -85,10 +87,23 @@ module RuboCop
           node.if_branch&.guard_clause?
         end
 
+        def next_line_empty_or_enable_directive_comment?(line)
+          return true if next_line_empty?(line)
+
+          next_line = line + 1
+          next_line_enable_directive_comment?(next_line) && next_line_empty?(next_line)
+        end
+
         def next_line_empty?(line)
           processed_source[line].blank?
         end
 
+        def next_line_enable_directive_comment?(line)
+          return false unless (comment = processed_source.comment_at_line(line))
+
+          DirectiveComment.new(comment).enabled?
+        end
+
         def next_line_rescue_or_ensure?(node)
           parent = node.parent
           parent.nil? || parent.rescue_type? || parent.ensure_type?
@@ -137,8 +152,7 @@ module RuboCop
 
         def heredoc_line(node, heredoc_node)
           heredoc_body = heredoc_node.loc.heredoc_body
-          num_of_heredoc_lines =
-            heredoc_body.last_line - heredoc_body.first_line
+          num_of_heredoc_lines = heredoc_body.last_line - heredoc_body.first_line
 
           node.last_line + num_of_heredoc_lines + END_OF_HEREDOC_LINE
         end

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

@@ -111,8 +111,7 @@ module RuboCop
 
           return if line_count_allowed?(count)
           return if multiple_blank_lines_groups?(*nodes)
-          return if nodes.all?(&:single_line?) &&
-                    cop_config['AllowAdjacentOneLineDefs']
+          return if nodes.all?(&:single_line?) && cop_config['AllowAdjacentOneLineDefs']
 
           correction_node = nodes.last
           location = correction_node.loc.keyword.join(correction_node.loc.name)
@@ -160,10 +159,7 @@ module RuboCop
         def message(node, count: nil)
           type = node_type(node)
 
-          format(MSG,
-                 type: type,
-                 expected: expected_lines,
-                 actual: count)
+          format(MSG, type: type, expected: expected_lines, actual: count)
         end
 
         def expected_lines

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

@@ -29,9 +29,7 @@ module RuboCop
           return if processed_source.tokens.empty?
 
           lines = Set.new
-          processed_source.each_token do |token|
-            lines << token.line
-          end
+          processed_source.each_token { |token| lines << token.line }
 
           each_extra_empty_line(lines.sort) do |range|
             add_offense(range) do |corrector|

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

@@ -46,8 +46,7 @@ module RuboCop
         extend AutoCorrector
 
         MSG_AFTER = 'Keep a blank line after `%<modifier>s`.'
-        MSG_BEFORE_AND_AFTER = 'Keep a blank line before and after ' \
-                               '`%<modifier>s`.'
+        MSG_BEFORE_AND_AFTER = 'Keep a blank line before and after `%<modifier>s`.'
 
         MSG_BEFORE_FOR_ONLY_BEFORE = 'Keep a blank line before `%<modifier>s`.'
         MSG_AFTER_FOR_ONLY_BEFORE = 'Remove a blank line after `%<modifier>s`.'
@@ -73,10 +72,8 @@ module RuboCop
         end
 
         def on_sclass(node)
-          @class_or_module_def_first_line =
-            node.identifier.source_range.first_line
-          @class_or_module_def_last_line =
-            node.source_range.last_line
+          @class_or_module_def_first_line = node.identifier.source_range.first_line
+          @class_or_module_def_last_line = node.source_range.last_line
         end
 
         def on_block(node)
@@ -133,19 +130,14 @@ module RuboCop
         end
 
         def previous_line_ignoring_comments(processed_source, send_line)
-          processed_source[0..send_line - 2].reverse.find do |line|
-            !comment_line?(line)
-          end
+          processed_source[0..send_line - 2].reverse.find { |line| !comment_line?(line) }
         end
 
         def previous_line_empty?(send_line)
-          previous_line = previous_line_ignoring_comments(processed_source,
-                                                          send_line)
+          previous_line = previous_line_ignoring_comments(processed_source, send_line)
           return true unless previous_line
 
-          block_start?(send_line) ||
-            class_def?(send_line) ||
-            previous_line.blank?
+          block_start?(send_line) || class_def?(send_line) || previous_line.blank?
         end
 
         def next_line_empty?(last_send_line)
@@ -155,8 +147,7 @@ module RuboCop
         end
 
         def empty_lines_around?(node)
-          previous_line_empty?(node.first_line) &&
-            next_line_empty?(node.last_line)
+          previous_line_empty?(node.first_line) && next_line_empty?(node.last_line)
         end
 
         def class_def?(line)
@@ -193,8 +184,7 @@ module RuboCop
         def message_for_around_style(node)
           send_line = node.first_line
 
-          if block_start?(send_line) ||
-             class_def?(send_line)
+          if block_start?(send_line) || class_def?(send_line)
             format(MSG_AFTER, modifier: node.loc.selector.source)
           else
             format(MSG_BEFORE_AND_AFTER, modifier: node.loc.selector.source)

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

@@ -84,10 +84,7 @@ module RuboCop
             # below the keyword
             check_line(style, line, message('after', keyword), &:empty?)
             # above the keyword
-            check_line(style,
-                       line - 2,
-                       message('before', keyword),
-                       &:empty?)
+            check_line(style, line - 2, message('before', keyword), &:empty?)
           end
         end
 
@@ -113,10 +110,7 @@ module RuboCop
         end
 
         def keyword_locations_in_rescue(node)
-          [
-            node.loc.else,
-            *node.resbody_branches.map { |body| body.loc.keyword }
-          ].compact
+          [node.loc.else, *node.resbody_branches.map { |body| body.loc.keyword }].compact
         end
 
         def keyword_locations_in_ensure(node)

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

@@ -168,8 +168,7 @@ module RuboCop
           return node.parent if node.case_type? && node.argument?
 
           assignment = node.ancestors.find(&:assignment_or_similar?)
-          if assignment && !line_break_before_keyword?(assignment.source_range,
-                                                       node)
+          if assignment && !line_break_before_keyword?(assignment.source_range, node)
             assignment
           else
             # Fall back to 'keyword' style if this node is not on the RHS of an

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

@@ -65,7 +65,7 @@ module RuboCop
 
         # If there is no LF on the last line, we don't care if there's no CR.
         def unimportant_missing_cr?(index, last_line, line)
-          style == :crlf && index == last_line - 1 && !/\n$/.match?(line)
+          style == :crlf && index == last_line - 1 && !line.end_with?("\n")
         end
 
         def offense_message(line)

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

@@ -34,8 +34,7 @@ module RuboCop
         include RangeHelp
 
         MSG_UNNECESSARY = 'Unnecessary spacing detected.'
-        MSG_UNALIGNED_ASGN = '`=` is not aligned with the %<location>s ' \
-                             'assignment.'
+        MSG_UNALIGNED_ASGN = '`=` is not aligned with the %<location>s assignment.'
 
         def on_new_investigation
           return if processed_source.blank?
@@ -81,15 +80,12 @@ module RuboCop
         end
 
         def check_other(token1, token2, ast)
-          return false if allow_for_trailing_comments? &&
-                          token2.text.start_with?('#')
+          return false if allow_for_trailing_comments? && token2.text.start_with?('#')
 
           extra_space_range(token1, token2) do |range|
             next if ignored_range?(ast, range.begin_pos)
 
-            add_offense(range, message: MSG_UNNECESSARY) do |corrector|
-              corrector.remove(range)
-            end
+            add_offense(range, message: MSG_UNNECESSARY) { |corrector| corrector.remove(range) }
           end
         end
 

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

@@ -120,8 +120,7 @@ module RuboCop
             check_first(first_elem, left_bracket, left_parenthesis, 0)
           end
 
-          check_right_bracket(array_node.loc.end, left_bracket,
-                              left_parenthesis)
+          check_right_bracket(array_node.loc.end, left_bracket, left_parenthesis)
         end
 
         def check_right_bracket(right_bracket, left_bracket, left_parenthesis)

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

@@ -21,8 +21,7 @@ module RuboCop
         include FirstElementLineBreak
         extend AutoCorrector
 
-        MSG = 'Add a line break before the first element of a ' \
-              'multi-line array.'
+        MSG = 'Add a line break before the first element of a 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_indentation.rb

@@ -91,6 +91,8 @@ module RuboCop
         end
 
         def on_send(node)
+          return if enforce_first_argument_with_fixed_indentation?
+
           each_argument_node(node, :hash) do |hash_node, left_parenthesis|
             check(hash_node, left_parenthesis)
           end
@@ -117,8 +119,7 @@ module RuboCop
             return if first_pair.first_line == left_brace.line
 
             if separator_style?(first_pair)
-              check_based_on_longest_key(hash_node, left_brace,
-                                         left_parenthesis)
+              check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
             else
               check_first(first_pair, left_brace, left_parenthesis, 0)
             end
@@ -148,9 +149,7 @@ module RuboCop
         end
 
         def check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
-          key_lengths = hash_node.keys.map do |key|
-            key.source_range.length
-          end
+          key_lengths = hash_node.keys.map { |key| key.source_range.length }
           check_first(hash_node.pairs.first, left_brace, left_parenthesis,
                       key_lengths.max - key_lengths.first)
         end
@@ -185,6 +184,16 @@ module RuboCop
             'where the left brace is.'
           end
         end
+
+        def enforce_first_argument_with_fixed_indentation?
+          return false unless argument_alignment_config['Enabled']
+
+          argument_alignment_config['EnforcedStyle'] == 'with_fixed_indentation'
+        end
+
+        def argument_alignment_config
+          config.for_cop('Layout/ArgumentAlignment')
+        end
       end
     end
   end