rubocop 0.51.0 → 0.52.0

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

@@ -5,6 +5,37 @@ module RuboCop
     module Layout
       # Checks that braces used for hash literals have or don't have
       # surrounding space depending on configuration.
+      #
+      # @example EnforcedStyle: space
+      #   # The `space` style enforces that hash literals have
+      #   # surrounding space.
+      #
+      #   # bad
+      #   h = {a: 1, b: 2}
+      #
+      #   # good
+      #   h = { a: 1, b: 2 }
+      #
+      # @example EnforcedStyle: no_space
+      #   # The `no_space` style enforces that hash literals have
+      #   # no surrounding space.
+      #
+      #   # bad
+      #   h = { a: 1, b: 2 }
+      #
+      #   # good
+      #   h = {a: 1, b: 2}
+      #
+      # @example EnforcedStyle: compact
+      #   # The `compact` style normally requires a space inside
+      #   # hash braces, with the exception that successive left
+      #   # braces or right braces are collapsed together in nested hashes.
+      #
+      #   # bad
+      #   h = { a: { b: 2 } }
+      #
+      #   # good
+      #   h = { a: { b: 2 }}
       class SpaceInsideHashLiteralBraces < Cop
         include SurroundingSpace
         include ConfigurableEnforcedStyle
@@ -22,36 +53,45 @@ module RuboCop
           end
         end
 
+        def autocorrect(range)
+          lambda do |corrector|
+            # It is possible that BracesAroundHashParameters will remove the
+            # braces while this cop inserts spaces. This can lead to unwanted
+            # changes to the inspected code. If we replace the brace with a
+            # brace plus space (rather than just inserting a space), then any
+            # removal of the same brace will give us a clobbering error. This
+            # in turn will make RuboCop fall back on cop-by-cop
+            # auto-correction.  Problem solved.
+            case range.source
+            when /\s/ then corrector.remove(range)
+            when '{' then corrector.replace(range, '{ ')
+            else corrector.replace(range, ' }')
+            end
+          end
+        end
+
         private
 
         def hash_literal_with_braces(node)
           tokens = processed_source.tokens
           begin_index = index_of_first_token(node)
-          return unless left_brace?(tokens[begin_index])
+          return unless tokens[begin_index].left_brace?
 
           end_index = index_of_last_token(node)
-          return unless right_brace?(tokens[end_index])
+          return unless tokens[end_index].right_curly_brace?
 
           yield begin_index, end_index
         end
 
-        def left_brace?(token)
-          token.type == :tLBRACE
-        end
-
-        def right_brace?(token)
-          token.type == :tRCURLY
-        end
-
         def check(t1, t2)
           # No offense if line break inside.
-          return if t1.pos.line < t2.pos.line
-          return if t2.type == :tCOMMENT # Also indicates there's a line break.
+          return if t1.line < t2.line
+          return if t2.comment? # Also indicates there's a line break.
 
-          is_empty_braces = left_brace?(t1) && right_brace?(t2)
+          is_empty_braces = t1.left_brace? && t2.right_curly_brace?
           expect_space    = expect_space?(t1, t2)
 
-          if offense?(t1, t2, expect_space)
+          if offense?(t1, expect_space)
             incorrect_style_detected(t1, t2, expect_space, is_empty_braces)
           else
             correct_style_detected
@@ -60,7 +100,7 @@ module RuboCop
 
         def expect_space?(t1, t2)
           is_same_braces  = t1.type == t2.type
-          is_empty_braces = left_brace?(t1) && right_brace?(t2)
+          is_empty_braces = t1.left_brace? && t2.right_curly_brace?
 
           if is_same_braces && style == :compact
             false
@@ -92,8 +132,8 @@ module RuboCop
           end
         end
 
-        def offense?(t1, t2, expect_space)
-          has_space = space_between?(t1, t2)
+        def offense?(t1, expect_space)
+          has_space = t1.space_after?
           expect_space ? !has_space : has_space
         end
 
@@ -107,23 +147,6 @@ module RuboCop
           format(MSG, "#{inside_what} #{problem}")
         end
 
-        def autocorrect(range)
-          lambda do |corrector|
-            # It is possible that BracesAroundHashParameters will remove the
-            # braces while this cop inserts spaces. This can lead to unwanted
-            # changes to the inspected code. If we replace the brace with a
-            # brace plus space (rather than just inserting a space), then any
-            # removal of the same brace will give us a clobbering error. This
-            # in turn will make RuboCop fall back on cop-by-cop
-            # auto-correction.  Problem solved.
-            case range.source
-            when /\s/ then corrector.remove(range)
-            when '{' then corrector.replace(range, '{ ')
-            else corrector.replace(range, ' }')
-            end
-          end
-        end
-
         def space_range(token_range)
           if token_range.source == '{'
             range_of_space_to_the_right(token_range)

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

@@ -14,10 +14,38 @@ module RuboCop
       #   f(3)
       #   g = (a + 3)
       class SpaceInsideParens < Cop
-        include SpaceInside
+        include SurroundingSpace
 
-        def specifics
-          [%i[tLPAREN tLPAREN2], :tRPAREN, 'parentheses']
+        MSG = 'Space inside parentheses detected.'.freeze
+
+        def investigate(processed_source)
+          @processed_source = processed_source
+          each_extraneous_space(processed_source.tokens) do |range|
+            add_offense(range, location: range)
+          end
+        end
+
+        def autocorrect(range)
+          ->(corrector) { corrector.remove(range) }
+        end
+
+        private
+
+        def each_extraneous_space(tokens)
+          tokens.each_cons(2) do |t1, t2|
+            next unless parens?(t1, t2)
+
+            # If the second token is a comment, that means that a line break
+            # follows, and that the rules for space inside don't apply.
+            next if t2.comment?
+            next unless t2.line == t1.line && t1.space_after?
+
+            yield range_between(t1.end_pos, t2.begin_pos)
+          end
+        end
+
+        def parens?(t1, t2)
+          t1.left_parens? || t2.right_parens?
         end
       end
     end

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

@@ -28,21 +28,6 @@ module RuboCop
           check(node)
         end
 
-        private
-
-        def check(node)
-          expression = node.source
-          op = node.loc.operator.source
-          escaped_op = op.gsub(/\./, '\.')
-
-          # account for multiline range literals
-          expression.sub!(/#{escaped_op}\n\s*/, op)
-
-          return unless expression =~ /(\s#{escaped_op})|(#{escaped_op}\s)/
-
-          add_offense(node)
-        end
-
         def autocorrect(node)
           expression = node.source
           operator = node.loc.operator.source
@@ -57,6 +42,21 @@ module RuboCop
             )
           end
         end
+
+        private
+
+        def check(node)
+          expression = node.source
+          op = node.loc.operator.source
+          escaped_op = op.gsub(/\./, '\.')
+
+          # account for multiline range literals
+          expression.sub!(/#{escaped_op}\n\s*/, op)
+
+          return unless expression =~ /(\s#{escaped_op})|(#{escaped_op}\s)/
+
+          add_offense(node)
+        end
       end
     end
   end

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

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Layout
+      # Checks that reference brackets have or don't have
+      # surrounding space depending on configuration.
+      #
+      # @example EnforcedStyle: no_space (default)
+      #   # The `no_space` style enforces that reference brackets have
+      #   # no surrounding space.
+      #
+      #   # bad
+      #   hash[ :key ]
+      #   array[ index ]
+      #
+      #   # good
+      #   hash[:key]
+      #   array[index]
+      #
+      # @example EnforcedStyle: space
+      #   # The `space` style enforces that reference brackets have
+      #   # surrounding space.
+      #
+      #   # bad
+      #   hash[:key]
+      #   array[index]
+      #
+      #   # good
+      #   hash[ :key ]
+      #   array[ index ]
+      class SpaceInsideReferenceBrackets < Cop
+        include SurroundingSpace
+        include ConfigurableEnforcedStyle
+
+        MSG = '%<command>s space inside reference brackets.'.freeze
+
+        def on_send(node)
+          return if node.multiline?
+          return unless left_ref_bracket(node)
+          left_token = left_ref_bracket(node)
+          right_token = right_ref_bracket(node, left_token)
+
+          if style == :no_space
+            no_space_offenses(node, left_token, right_token, MSG)
+          else
+            space_offenses(node, left_token, right_token, MSG)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            left, right = reference_brackets(node)
+
+            if style == :no_space
+              no_space_corrector(corrector, left, right)
+            else
+              space_corrector(corrector, left, right)
+            end
+          end
+        end
+
+        private
+
+        def reference_brackets(node)
+          left = left_ref_bracket(node)
+          [left, right_ref_bracket(node, left)]
+        end
+
+        def left_ref_bracket(node)
+          tokens(node).reverse.find(&:left_ref_bracket?)
+        end
+
+        def right_ref_bracket(node, token)
+          i = tokens(node).index(token)
+          tokens(node).slice(i..-1).find(&:right_bracket?)
+        end
+      end
+    end
+  end
+end

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

@@ -5,11 +5,18 @@ module RuboCop
     module Layout
       # This cop checks for whitespace within string interpolations.
       #
-      # @example
-      #   # Good if EnforcedStyle is no_space, bad if space.
+      # @example EnforcedStyle: no_space (default)
+      #   # bad
+      #      var = "This is the #{ space } example"
+      #
+      #   # good
+      #      var = "This is the #{no_space} example"
+      #
+      # @example EnforcedStyle: space
+      #   # bad
       #      var = "This is the #{no_space} example"
       #
-      #   # Good if EnforceStyle is space, bad if no_space.
+      #   # good
       #      var = "This is the #{ space } example"
       class SpaceInsideStringInterpolation < Cop
         include ConfigurableEnforcedStyle
@@ -23,6 +30,16 @@ module RuboCop
           end
         end
 
+        def autocorrect(node)
+          new_source = style == :no_space ? node.source : " #{node.source} "
+          lambda do |corrector|
+            corrector.replace(
+              range_with_surrounding_space(range: node.source_range),
+              new_source
+            )
+          end
+        end
+
         private
 
         def each_style_violation(node)
@@ -44,25 +61,19 @@ module RuboCop
 
         def space_on_any_side?(node)
           interp = node.source_range
-          interp_with_surrounding_space = range_with_surrounding_space(interp)
+          interp_with_surrounding_space =
+            range_with_surrounding_space(range: interp)
 
           interp_with_surrounding_space != interp
         end
 
         def space_on_each_side?(node)
           interp = node.source_range
-          interp_with_surrounding_space = range_with_surrounding_space(interp)
+          interp_with_surrounding_space =
+            range_with_surrounding_space(range: interp)
 
           interp_with_surrounding_space.source == " #{interp.source} "
         end
-
-        def autocorrect(node)
-          new_source = style == :no_space ? node.source : " #{node.source} "
-          lambda do |corrector|
-            corrector.replace(range_with_surrounding_space(node.source_range),
-                              new_source)
-          end
-        end
       end
     end
   end

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

@@ -28,8 +28,6 @@ module RuboCop
           end
         end
 
-        private
-
         def autocorrect(range)
           lambda do |corrector|
             spaces = ' ' * configured_indentation_width
@@ -37,6 +35,8 @@ module RuboCop
           end
         end
 
+        private
+
         def string_literal_lines(ast)
           # which lines start inside a string literal?
           return [] if ast.nil?

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

@@ -28,6 +28,12 @@ module RuboCop
                            whitespace_at_end)
         end
 
+        def autocorrect(range)
+          lambda do |corrector|
+            corrector.replace(range, style == :final_newline ? "\n" : "\n\n")
+          end
+        end
+
         private
 
         def offense_detected(sb, wanted_blank_lines, blank_lines,
@@ -48,7 +54,7 @@ module RuboCop
           return true if sb.source.strip.start_with?('__END__')
           return false if processed_source.tokens.empty?
 
-          extra = sb.source[processed_source.tokens.last.pos.end_pos..-1]
+          extra = sb.source[processed_source.tokens.last.end_pos..-1]
           extra && extra.strip.start_with?('__END__')
         end
 
@@ -68,12 +74,6 @@ module RuboCop
                    instead_of)
           end
         end
-
-        def autocorrect(range)
-          lambda do |corrector|
-            corrector.replace(range, style == :final_newline ? "\n" : "\n\n")
-          end
-        end
       end
     end
   end

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

@@ -29,39 +29,30 @@ module RuboCop
               ' associated with the `%s` method call.'.freeze
 
         def on_send(node)
-          return if node.parenthesized? || allowed_method?(node)
-          return if lambda_argument?(node.last_argument)
+          return if !node.arguments? || node.parenthesized? ||
+                    node.last_argument.lambda? || allowed_method?(node)
 
-          return unless method_with_block?(node.last_argument)
-          last_param = node.last_argument.children.first
-          return unless method_as_param?(last_param)
+          return unless ambiguous_block_association?(node)
 
           add_offense(node)
         end
 
         private
 
-        def allowed_method?(node)
-          node.assignment? || node.operator_method? || node.method?(:[])
-        end
-
-        def method_with_block?(param)
-          param && param.block_type?
+        def ambiguous_block_association?(send_node)
+          send_node.last_argument.block_type? &&
+            !send_node.last_argument.send_node.arguments?
         end
 
-        def method_as_param?(param)
-          param && param.send_type? && !param.arguments?
+        def allowed_method?(node)
+          node.assignment? || node.operator_method? || node.method?(:[])
         end
 
-        def message(node)
-          param = node.last_argument
+        def message(send_node)
+          block_param = send_node.last_argument
 
-          format(MSG, param.source, param.children.first.source)
+          format(MSG, block_param.source, block_param.send_node.source)
         end
-
-        def_node_matcher :lambda_argument?, <<-PATTERN
-          (block (send _ :lambda) ...)
-        PATTERN
       end
     end
   end