RubyGems - rubocop - Versions diffs - 0.22.0 → 0.23.0 - Mend

rubocop 0.22.0 → 0.23.0

Potentially problematic release.

This version of rubocop might be problematic. Click here for more details.

Files changed (484) hide show

data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for underscore-prefixed variables that are actually

data/lib/rubocop/cop/lint/unreachable_code.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for unreachable code.

data/lib/rubocop/cop/lint/unused_block_argument.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for unused block arguments.

data/lib/rubocop/cop/lint/unused_method_argument.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for unused method arguments.

data/lib/rubocop/cop/lint/useless_access_modifier.rb CHANGED

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for access modifiers without any code.

data/lib/rubocop/cop/lint/useless_assignment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for every useless assignment to local variable in every

data/lib/rubocop/cop/lint/useless_comparison.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for comparison of something with itself.

data/lib/rubocop/cop/lint/useless_else_without_rescue.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for useless `else` in `begin..end` without `rescue`.

data/lib/rubocop/cop/lint/useless_setter_call.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for setter call to local variable as the final

data/lib/rubocop/cop/lint/void.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for operators, variables and literals used

data/lib/rubocop/cop/mixin/annotation_comment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Common functionality related to annotation comments.
@@ -29,7 +29,7 @@ module Rubocop
         end
         def keyword?(word)
-          config.for_cop('CommentAnnotation')['Keywords'].include?(word)
+          config.for_cop('Style/CommentAnnotation')['Keywords'].include?(word)
         end
       end
     end

data/lib/rubocop/cop/mixin/array_syntax.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common code for ordinary arrays with [] that can be written with %
     # syntax.

data/lib/rubocop/cop/mixin/autocorrect_alignment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # This module does auto-correction of nodes that should just be moved to
     # the left or to the right, amount being determined by the instance
@@ -22,17 +22,24 @@ module Rubocop
         loc.expression.source_line[0...loc.column] =~ /^\s*$/
       end
-      def autocorrect(node)
+      def autocorrect(arg)
+        heredoc_ranges = heredoc_ranges(arg)
+        expr = arg.respond_to?(:loc) ? arg.loc.expression : arg
         # We can't use the instance variable inside the lambda. That would
         # just give each lambda the same reference and they would all get
         # the last value of @column_delta. A local variable fixes the
         # problem.
         column_delta = @column_delta
+        fail CorrectionNotPossible if block_comment_within?(expr)
         @corrections << lambda do |corrector|
-          expr = node.loc.expression
           each_line(expr) do |line_begin_pos|
             range = calculate_range(expr, line_begin_pos, column_delta)
+            # We must not change indentation of heredoc stings.
+            next if heredoc_ranges.any? { |h| within?(range, h) }
             if column_delta > 0
               unless range.source == "\n"
                 corrector.insert_before(range, ' ' * column_delta)
@@ -44,6 +51,28 @@ module Rubocop
         end
       end
+      private
+      def heredoc_ranges(arg)
+        return [] unless arg.is_a?(Parser::AST::Node)
+        heredoc_ranges = []
+        on_node(:dstr, arg) do |n|
+          heredoc_ranges << n.loc.heredoc_body.join(n.loc.heredoc_end)
+        end
+        heredoc_ranges
+      end
+      def block_comment_within?(expr)
+        processed_source.comments.select { |c| c.document? }.find do |c|
+          within?(c.loc.expression, expr)
+        end
+      end
+      def within?(inner, outer)
+        inner.begin_pos >= outer.begin_pos && inner.end_pos <= outer.end_pos
+      end
       def calculate_range(expr, line_begin_pos, column_delta)
         starts_with_space = expr.source_buffer.source[line_begin_pos] =~ / /
         pos_to_remove = if column_delta > 0 || starts_with_space

data/lib/rubocop/cop/mixin/autocorrect_unless_changing_ast.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # This module does auto-correction of nodes that could become grammatically
     # different after the correction. If the code change would alter the

data/lib/rubocop/cop/mixin/check_assignment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for checking assignment nodes.
     module CheckAssignment

data/lib/rubocop/cop/mixin/check_methods.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for checking instance methods and singeton methods.
     module CheckMethods

data/lib/rubocop/cop/mixin/code_length.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for checking length of code segments.
     module CodeLength

data/lib/rubocop/cop/mixin/configurable_enforced_style.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Handles `EnforcedStyle` configuration parameters.
     module ConfigurableEnforcedStyle

data/lib/rubocop/cop/mixin/configurable_max.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Handles `Max` configuration parameters, especially setting them to an
     # appropriate value with --auto-gen-config.

data/lib/rubocop/cop/mixin/configurable_naming.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # This module provides functionality for checking if names match the
     # configured EnforcedStyle.

data/lib/rubocop/cop/mixin/if_node.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for checking if nodes.
     module IfNode

data/lib/rubocop/cop/mixin/if_then_else.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for cops checking if and unless statements.
     module IfThenElse

data/lib/rubocop/cop/mixin/negative_conditional.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Some common code shared between FavorUnlessOverNegatedIf and
     # FavorUntilOverNegatedWhile.

data/lib/rubocop/cop/mixin/parser_diagnostic.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for cops which processes Parser's diagnostics.
     # This mixin requires its user class to define `#relevant_diagnostic?`.

data/lib/rubocop/cop/mixin/percent_literal.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for handling percent literals.
     module PercentLiteral

data/lib/rubocop/cop/mixin/safe_assignment.rb CHANGED

@@ -1,14 +1,25 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for safe assignment. By safe assignment we mean
     # putting parentheses around an assignment to indicate "I know I'm using an
     # assignment as a condition. It's not a mistake."
     module SafeAssignment
       def safe_assignment?(node)
-        node.type == :begin && node.children.size == 1 &&
-          Util::EQUALS_ASGN_NODES.include?(node.children[0].type)
+        return false unless node.type == :begin
+        return false unless node.children.size == 1
+        child = node.children.first
+        case child.type
+        when *Util::EQUALS_ASGN_NODES
+          true
+        when :send
+          _receiver, method_name, _args = *child
+          method_name.to_s.end_with?('=')
+        else
+          false
+        end
       end
       def safe_assignment_allowed?

data/lib/rubocop/cop/mixin/space_after_punctuation.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for cops checking for missing space after
     # punctuation.

data/lib/rubocop/cop/mixin/space_inside.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for checking for spaces inside various
     # kinds of parentheses.

data/lib/rubocop/cop/mixin/statement_modifier.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for modifier cops.
     module StatementModifier
@@ -35,7 +35,7 @@ module Rubocop
       def max_line_length
         cop_config && cop_config['MaxLineLength'] ||
-        config.for_cop('LineLength')['Max']
+        config.for_cop('Style/LineLength')['Max']
       end
       def length(sexp)

data/lib/rubocop/cop/mixin/string_help.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Classes that include this module just implement functions to determine
     # what is an offense and how to do auto-correction. They get help with

data/lib/rubocop/cop/mixin/surrounding_space.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Common functionality for checking surrounding space.
     module SurroundingSpace

data/lib/rubocop/cop/mixin/unused_argument.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # Common functionality for cops handling unused arguments.

data/lib/rubocop/cop/offense.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # An offense represents a style violation detected by RuboCop.
     class Offense
@@ -10,7 +10,7 @@ module Rubocop
       #
       # @!attribute [r] severity
       #
-      # @return [Rubocop::Cop::Severity]
+      # @return [RuboCop::Cop::Severity]
       attr_reader :severity
       # @api public
@@ -64,7 +64,7 @@ module Rubocop
       # @api private
       def initialize(severity, location, message, cop_name, corrected = false)
-        @severity = Rubocop::Cop::Severity.new(severity)
+        @severity = RuboCop::Cop::Severity.new(severity)
         @location = location.freeze
         @line = location.line.freeze
         @column = location.column.freeze

data/lib/rubocop/cop/rails/action_filter.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Rails
       # This cop enforces the consistent use of action filters methods.

data/lib/rubocop/cop/rails/default_scope.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Rails
       # This cop checks for default_scope calls when it was passed

data/lib/rubocop/cop/rails/delegate.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Rails
       # This cop looks for delegations, that could have been created

data/lib/rubocop/cop/rails/has_and_belongs_to_many.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Rails
       # This cop checks for the use of the has_and_belongs_to_many macro.

data/lib/rubocop/cop/rails/output.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Rails
       # This cop checks for the use of output calls like puts and print