rubocop 0.48.1 → 0.49.0

data/lib/rubocop/cop/{style → layout}/empty_lines_around_exception_handling_keywords.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks if empty lines exist around the bodies of `begin`
       # sections. This cop doesn't check empty lines at `begin` body
       # beginning/end and around method definition body.

data/lib/rubocop/cop/{style → layout}/empty_lines_around_method_body.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks if empty lines exist around the bodies of methods.
       #
       # @example

data/lib/rubocop/cop/{style → layout}/empty_lines_around_module_body.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks if empty lines around the bodies of modules match
       # the configuration.
       #

data/lib/rubocop/cop/{style → layout}/end_of_line.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for Windows-style line endings in the source code.
       class EndOfLine < Cop
         include ConfigurableEnforcedStyle

data/lib/rubocop/cop/{style → layout}/extra_spacing.rb

@@ -4,7 +4,7 @@ require 'set'
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for extra/unnecessary whitespace.
       #
       # @example

data/lib/rubocop/cop/{style → layout}/first_array_element_line_break.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for a line break before the first element in a
       # multi-line array.
       #

data/lib/rubocop/cop/{style → layout}/first_hash_element_line_break.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for a line break before the first element in a
       # multi-line hash.
       #

data/lib/rubocop/cop/{style → layout}/first_method_argument_line_break.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for a line break before the first argument in a
       # multi-line method call.
       #

data/lib/rubocop/cop/{style → layout}/first_method_parameter_line_break.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for a line break before the first parameter in a
       # multi-line method parameter definition.
       #

data/lib/rubocop/cop/{style → layout}/first_parameter_indentation.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks the indentation of the first parameter in a method call.
       # Parameters after the first one are checked by Style/AlignParameters, not
       # by this cop.

data/lib/rubocop/cop/{style → layout}/indent_array.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks the indentation of the first element in an array literal
       # where the opening bracket and the first element are on separate lines.
       # The other elements' indentations are handled by the AlignArray cop.

data/lib/rubocop/cop/{style → layout}/indent_assignment.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks the indentation of the first line of the
       # right-hand-side of a multi-line assignment.
       #

data/lib/rubocop/cop/{style → layout}/indent_hash.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks the indentation of the first key in a hash literal
       # where the opening brace and the first key are on separate lines. The
       # other keys' indentations are handled by the AlignHash cop.
@@ -102,7 +102,7 @@ module RuboCop
         def separator_style?(first_pair)
           separator = first_pair.loc.operator
           key = "Enforced#{separator.is?(':') ? 'Colon' : 'HashRocket'}Style"
-          config.for_cop('Style/AlignHash')[key] == 'separator'
+          config.for_cop('Layout/AlignHash')[key] == 'separator'
         end
 
         def check_based_on_longest_key(pairs, left_brace, left_parenthesis)

data/lib/rubocop/cop/{style → layout}/indent_heredoc.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks the indentation of the here document bodies. The bodies
       # are indented one step.
       # In Ruby 2.3 or newer, squiggly heredocs (`<<~`) should be used. If you
@@ -105,8 +105,8 @@ module RuboCop
             if heredoc_indent_type(node) == '~'
               corrector.replace(node.loc.heredoc_body, indented_body(node))
             else
-              heredoc_begenning = node.loc.expression.source
-              corrected = heredoc_begenning.sub(/<<-?/, '<<~')
+              heredoc_beginning = node.loc.expression.source
+              corrected = heredoc_beginning.sub(/<<-?/, '<<~')
               corrector.replace(node.loc.expression, corrected)
             end
           end

data/lib/rubocop/cop/{style → layout}/indentation_consistency.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks for inconsistent indentation.
       #
       # @example

data/lib/rubocop/cop/{style → layout}/indentation_width.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks for indentation that doesn't use the specified number
       # of spaces.
       #
@@ -45,7 +45,7 @@ module RuboCop
       #     end
       #   end
       #   end
-      class IndentationWidth < Cop # rubocop:disable Metrics/ClassLength
+      class IndentationWidth < Cop
         include EndKeywordAlignment
         include AutocorrectAlignment
         include OnMethodDef
@@ -75,17 +75,15 @@ module RuboCop
         end
 
         def on_block(node)
-          _method, _args, body = *node
-          # Check body against end/} indentation. Checking against variable
-          # assignments, etc, would be more difficult. The end/} must be at the
-          # beginning of its line.
-          loc = node.loc
-          return unless begins_its_line?(loc.end)
-
-          check_indentation(loc.end, body)
+          end_loc = node.loc.end
+
+          return unless begins_its_line?(end_loc)
+
+          check_indentation(end_loc, node.body)
+
           return unless indentation_consistency_style == 'rails'
 
-          check_members(loc.end, [body])
+          check_members(end_loc, [node.body])
         end
 
         def on_module(node)
@@ -173,7 +171,7 @@ module RuboCop
         end
 
         def indentation_consistency_style
-          config.for_cop('Style/IndentationConsistency')['EnforcedStyle']
+          config.for_cop('Layout/IndentationConsistency')['EnforcedStyle']
         end
 
         def check_assignment(node, rhs)

data/lib/rubocop/cop/{style → layout}/initial_indentation.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cops checks for indentation of the first non-blank non-comment
       # line in a file.
       class InitialIndentation < Cop

data/lib/rubocop/cop/{style → layout}/leading_comment_space.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks whether comments have a leading space
       # after the # denoting the start of the comment. The
       # leading space is not required for some RDoc special syntax,

data/lib/rubocop/cop/{style → layout}/multiline_array_brace_layout.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks that the closing brace in an array literal is either
       # on the same line as the last array element, or a new line.
       #

data/lib/rubocop/cop/{style → layout}/multiline_assignment_layout.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks whether the multiline assignments have a newline
       # after the assignment operator.
       #

data/lib/rubocop/cop/{style → layout}/multiline_block_layout.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks whether the multiline do end blocks have a newline
       # after the start of the block. Additionally, it checks whether the block
       # arguments, if any, are on the same line as the start of the block.
@@ -42,32 +42,22 @@ module RuboCop
                   'block start.'.freeze
 
         def on_block(node)
-          return if oneliner?(node)
+          return if node.single_line?
 
-          # A block node has three children: the block start,
-          # the arguments, and the expression. We care if the block start
-          # with arguments and the expression start on the same line.
-          _block_start, args, last_expression = node.children
-          do_loc = node.loc.begin # Actually it's either do or {.
-
-          if args_on_different_line?(do_loc.line, args)
-            add_offense_for_expression(node, args, ARG_MSG)
+          unless args_on_beginning_line?(node)
+            add_offense_for_expression(node, node.arguments, ARG_MSG)
           end
 
-          return unless last_expression
-          expression_loc = last_expression.loc
-          return unless do_loc.line == expression_loc.line
-          add_offense_for_expression(node, last_expression, MSG)
-        end
+          return unless node.body && node.loc.begin.line == node.body.loc.line
 
-        def oneliner?(node)
-          node.loc.begin.line == node.loc.end.line
+          add_offense_for_expression(node, node.body, MSG)
         end
 
-        def args_on_different_line?(do_line, args)
-          return false if args.children.empty?
+        private
 
-          do_line != args.loc.last_line
+        def args_on_beginning_line?(node)
+          !node.arguments? ||
+            node.loc.begin.line == node.arguments.loc.last_line
         end
 
         def add_offense_for_expression(node, expr, msg)
@@ -79,31 +69,26 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            _method, args, block_body = *node
-            unless arguments_on_different_line?(node, args)
-              autocorrect_arguments(corrector, node, args)
-              expr_before_body = args.source_range.end
+            unless args_on_beginning_line?(node)
+              autocorrect_arguments(corrector, node)
+              expr_before_body = node.arguments.source_range.end
             end
 
-            return unless block_body
+            return unless node.body
 
             expr_before_body ||= node.loc.begin
-            if expr_before_body.line == block_body.loc.line
-              autocorrect_body(corrector, node, block_body)
+
+            if expr_before_body.line == node.body.loc.line
+              autocorrect_body(corrector, node, node.body)
             end
           end
         end
 
-        def arguments_on_different_line?(node, args)
-          args.children.empty? || args.loc.last_line == node.loc.line
-        end
-
-        def autocorrect_arguments(corrector, node, args)
-          end_pos =
-            range_with_surrounding_space(args.source_range, :right, false)
-            .end_pos
+        def autocorrect_arguments(corrector, node)
+          end_pos = range_with_surrounding_space(node.arguments.source_range,
+                                                 :right, false).end_pos
           range = range_between(node.loc.begin.end.begin_pos, end_pos)
-          corrector.replace(range, " |#{block_arg_string(args)}|")
+          corrector.replace(range, " |#{block_arg_string(node.arguments)}|")
         end
 
         def autocorrect_body(corrector, node, block_body)

data/lib/rubocop/cop/{style → layout}/multiline_hash_brace_layout.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks that the closing brace in a hash literal is either
       # on the same line as the last hash element, or a new line.
       #
@@ -72,6 +72,10 @@ module RuboCop
         ALWAYS_SAME_LINE_MESSAGE = 'Closing hash brace must be on the same ' \
           'line as the last hash element.'.freeze
 
+        def self.autocorrect_incompatible_with
+          [Style::BracesAroundHashParameters]
+        end
+
         def on_hash(node)
           check_brace_layout(node)
         end

data/lib/rubocop/cop/{style → layout}/multiline_method_call_brace_layout.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks that the closing brace in a method call is either
       # on the same line as the last method argument, or a new line.
       #

data/lib/rubocop/cop/{style → layout}/multiline_method_call_indentation.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks the indentation of the method name part in method calls
       # that span more than one line.
       #
@@ -56,7 +56,7 @@ module RuboCop
           return unless style == :aligned && cop_config['IndentationWidth']
 
           raise ValidationError,
-                'The `Style/MultilineMethodCallIndentation`' \
+                'The `Layout/MultilineMethodCallIndentation`' \
                 ' cop only accepts an `IndentationWidth` ' \
                 'configuration parameter when ' \
                 '`EnforcedStyle` is `indented`.'
@@ -188,7 +188,7 @@ module RuboCop
         end
 
         def semantic_alignment_node(node)
-          return if argument_in_method_call(node)
+          return if argument_in_method_call(node, :with_parentheses)
 
           # descend to root of method chain
           node = node.receiver while node.receiver

data/lib/rubocop/cop/{style → layout}/multiline_method_definition_brace_layout.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks that the closing brace in a method definition is either
       # on the same line as the last method parameter, or a new line.
       #

data/lib/rubocop/cop/{style → layout}/multiline_operation_indentation.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks the indentation of the right hand side operand in
       # binary operations that span more than one line.
       #
@@ -28,7 +28,7 @@ module RuboCop
         def validate_config
           return unless style == :aligned && cop_config['IndentationWidth']
 
-          raise ValidationError, 'The `Style/MultilineOperationIndentation`' \
+          raise ValidationError, 'The `Layout/MultilineOperationIndentation`' \
                                 ' cop only accepts an `IndentationWidth` ' \
                                 'configuration parameter when ' \
                                 '`EnforcedStyle` is `indented`.'
@@ -67,9 +67,10 @@ module RuboCop
             return true if begins_its_line?(assignment_rhs.source_range)
           end
 
-          given_style == :aligned && (kw_node_with_special_indentation(node) ||
-                                      assignment_node ||
-                                      argument_in_method_call(node))
+          given_style == :aligned &&
+            (kw_node_with_special_indentation(node) ||
+             assignment_node ||
+             argument_in_method_call(node, :with_or_without_parentheses))
         end
 
         def message(node, lhs, rhs)