rubocop 0.48.1 → 0.49.0

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks whether the rescue and ensure keywords are aligned
       # properly.
       #

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

@@ -2,10 +2,10 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for colon (:) not followed by some kind of space.
       # N.B. this cop does not handle spaces after a ternary operator, which are
-      # instead handled by Style/SpaceAroundOperators.
+      # instead handled by Layout/SpaceAroundOperators.
       class SpaceAfterColon < Cop
         MSG = 'Space missing after colon.'.freeze
 

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

@@ -2,13 +2,13 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for comma (,) not followed by some kind of space.
       class SpaceAfterComma < Cop
         include SpaceAfterPunctuation
 
         def space_style_before_rcurly
-          cfg = config.for_cop('Style/SpaceInsideHashLiteralBraces')
+          cfg = config.for_cop('Layout/SpaceInsideHashLiteralBraces')
           cfg['EnforcedStyle'] || 'space'
         end
 

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for space between a method name and a left parenthesis in defs.
       #
       # @example

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for space after `!`.
       #
       # @example

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

@@ -2,13 +2,13 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for semicolon (;) not followed by some kind of space.
       class SpaceAfterSemicolon < Cop
         include SpaceAfterPunctuation
 
         def space_style_before_rcurly
-          cfg = config.for_cop('Style/SpaceInsideBlockBraces')
+          cfg = config.for_cop('Layout/SpaceInsideBlockBraces')
           cfg['EnforcedStyle'] || 'space'
         end
 

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks the spacing inside and after block parameters pipes.
       #
       # @example
@@ -16,15 +16,17 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         def on_block(node)
-          _method, args, body = *node
+          return unless node.arguments?
+
+          args = node.arguments
+
           opening_pipe = args.loc.begin
           closing_pipe = args.loc.end
-          return unless !args.children.empty? && opening_pipe
 
           check_inside_pipes(args.children, opening_pipe, closing_pipe)
 
-          if body
-            check_space(closing_pipe.end_pos, body.source_range.begin_pos,
+          if node.body
+            check_space(closing_pipe.end_pos, node.body.source_range.begin_pos,
                         closing_pipe, 'after closing `|`')
           end
 

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks that the equals signs in parameter default assignments
       # have or don't have surrounding space depending on configuration.
       class SpaceAroundEqualsInParameterDefault < Cop

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks the spacing around the keywords.
       #
       # @example

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks that operators have space around them, except for **
       # which should not have surrounding space.
       class SpaceAroundOperators < Cop
@@ -10,6 +10,10 @@ module RuboCop
 
         IRREGULAR_METHODS = %i[[] ! []=].freeze
 
+        def self.autocorrect_incompatible_with
+          [Style::SelfAssignment]
+        end
+
         def on_pair(node)
           return unless node.hash_rocket?
 
@@ -129,7 +133,7 @@ module RuboCop
         end
 
         def align_hash_cop_config
-          config.for_cop('Style/AlignHash')
+          config.for_cop('Layout/AlignHash')
         end
 
         def hash_table_style?

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

@@ -2,14 +2,18 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks that block braces have or don't have a space before the opening
       # brace depending on configuration.
       class SpaceBeforeBlockBraces < Cop
         include ConfigurableEnforcedStyle
 
+        def self.autocorrect_incompatible_with
+          [Style::SymbolProc]
+        end
+
         def on_block(node)
-          return if node.loc.begin.is?('do') # No braces.
+          return if node.keywords?
 
           left_brace = node.loc.begin
           space_plus_brace = range_with_surrounding_space(left_brace)

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for comma (,) preceded by space.
       class SpaceBeforeComma < Cop
         include SpaceBeforePunctuation

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for missing space between a token and a comment on the
       # same line.
       class SpaceBeforeComment < Cop

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks that exactly one space is used between a method name and the
       # first argument for method calls without parentheses.
       #
@@ -14,10 +14,12 @@ module RuboCop
       #   @bad
       #   something  x
       #   something   y, z
+      #   something'hello'
       #
       #   @good
       #   something x
       #   something y, z
+      #   something 'hello'
       #
       class SpaceBeforeFirstArg < Cop
         include PrecedingFollowingAlignment
@@ -34,7 +36,7 @@ module RuboCop
           space = range_between(first_arg_with_space.begin_pos,
                                 first_arg.begin_pos)
 
-          add_offense(space, space) if space.length > 1
+          add_offense(space, space) if space.length != 1
         end
 
         def autocorrect(range)

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for semicolon (;) preceded by space.
       class SpaceBeforeSemicolon < Cop
         include SpaceBeforePunctuation

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for spaces between -> and opening parameter
       # brace in lambda literals.
       #

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for unnecessary additional spaces inside array percent literals
       # (i.e. %i/%w).
       #

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks that block braces have or don't have surrounding space inside
       # them on configuration. For blocks taking parameters, it checks that the
       # left brace has or doesn't have trailing space depending on
@@ -12,7 +12,7 @@ module RuboCop
         include SurroundingSpace
 
         def on_block(node)
-          return if node.loc.begin.is?('do') # No braces.
+          return if node.keywords?
 
           left_brace = node.loc.begin
           right_brace = node.loc.end
@@ -46,8 +46,7 @@ module RuboCop
         end
 
         def braces_with_contents_inside(node, inner)
-          _method, args, _body = *node
-          args_delimiter = args.loc.begin # Can be ( | or nil.
+          args_delimiter = node.arguments.loc.begin # Can be ( | or nil.
 
           check_left_brace(inner, node.loc.begin, args_delimiter)
           check_right_brace(inner, node.loc.end, block_length(node))

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for spaces inside square brackets.
       class SpaceInsideBrackets < Cop
         include SpaceInside

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks that braces used for hash literals have or don't have
       # surrounding space depending on configuration.
       class SpaceInsideHashLiteralBraces < Cop

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for spaces inside ordinary round parentheses.
       class SpaceInsideParens < Cop
         include SpaceInside

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

@@ -2,18 +2,19 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for unnecessary additional spaces inside the delimiters of
       # %i/%w/%x literals.
       #
       # @example
-      #   @good
+      #
+      #   # good
       #   %i(foo bar baz)
       #
-      #   @bad
+      #   # bad
       #   %w( foo bar baz )
       #
-      #   @bad
+      #   # bad
       #   %x(  ls -l )
       class SpaceInsidePercentLiteralDelimiters < Cop
         include MatchRange
@@ -27,11 +28,11 @@ module RuboCop
           process(node, '%i', '%I', '%w', '%W')
         end
 
-        def on_percent_literal(node)
-          add_offenses_for_unnecessary_spaces(node)
+        def on_xstr(node)
+          process(node, '%x')
         end
 
-        def on_xstr(node)
+        def on_percent_literal(node)
           add_offenses_for_unnecessary_spaces(node)
         end
 

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # Checks for spaces inside range literals.
       #
       # @example

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for whitespace within string interpolations.
       #
       # @example

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

@@ -4,7 +4,7 @@ require 'set'
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop checks for tabs inside the source code.
       class Tab < Cop
         MSG = 'Tab detected.'.freeze

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop looks for trailing blank lines and a final newline in the
       # source code.
       class TrailingBlankLines < Cop

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

@@ -2,14 +2,14 @@
 
 module RuboCop
   module Cop
-    module Style
+    module Layout
       # This cop looks for trailing whitespace in the source code.
       class TrailingWhitespace < Cop
         MSG = 'Trailing whitespace detected.'.freeze
 
         def investigate(processed_source)
           processed_source.lines.each_with_index do |line, index|
-            next unless line =~ /.*[ \t]+$/
+            next unless line.end_with?(' ', "\t")
 
             range = source_range(processed_source.buffer,
                                  index + 1,

data/lib/rubocop/cop/lint/ambiguous_block_association.rb

@@ -30,7 +30,7 @@ module RuboCop
 
         def on_send(node)
           return if node.parenthesized? || allowed_method?(node)
-          return if lambda_argument?(node.first_argument)
+          return if lambda_argument?(node.last_argument)
 
           return unless method_with_block?(node.last_argument)
           last_param = node.last_argument.children.first

data/lib/rubocop/cop/lint/ambiguous_operator.rb

@@ -33,10 +33,10 @@ module RuboCop
           hash[:operator] = key
         end
 
-        MSG_FORMAT = 'Ambiguous %{actual} operator. Parenthesize the method ' \
-                     "arguments if it's surely a %{actual} operator, or add " \
-                     'a whitespace to the right of the `%{operator}` if it ' \
-                     'should be a %{possible}.'.freeze
+        MSG_FORMAT = 'Ambiguous %<actual>s operator. Parenthesize the method ' \
+                     "arguments if it's surely a %<actual>s operator, or add " \
+                     'a whitespace to the right of the `%<operator>s` if it ' \
+                     'should be a %<possible>s.'.freeze
 
         private
 

data/lib/rubocop/cop/lint/debugger.rb

@@ -63,21 +63,6 @@ module RuboCop
           format(MSG, node.source)
         end
 
-        def autocorrect(node)
-          lambda do |corrector|
-            if pry_rescue?(node)
-              block = node.parent
-              body  = block.children[2] # (block <send> <parameters> <body>)
-              corrector.replace(block.source_range, body.source)
-            else
-              range = node.source_range
-              range = range_with_surrounding_space(range, :left, false)
-              range = range_with_surrounding_space(range, :right, true)
-              corrector.remove(range)
-            end
-          end
-        end
-
         def binding_irb?(node)
           target_ruby_version >= 2.4 && binding_irb_call?(node)
         end