rubocop 0.35.1 → 0.36.0

data/lib/rubocop/cop/style/one_line_conditional.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -9,10 +10,10 @@ module RuboCop
         include OnNormalIfUnless
 
         MSG = 'Favor the ternary operator (`?:`) ' \
-              'over `%s/then/else/end` constructs.'
+              'over `%s/then/else/end` constructs.'.freeze
 
         def on_normal_if_unless(node)
-          exp = node.loc.expression.source
+          exp = node.source
           return if exp.include?("\n")
           return unless node.loc.respond_to?(:else) && node.loc.else
           condition = exp.include?('if') ? 'if' : 'unless'

data/lib/rubocop/cop/style/op_method.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -6,13 +7,15 @@ module RuboCop
       # This cop makes sure that certain operator methods have their sole
       # parameter named `other`.
       class OpMethod < Cop
-        MSG = 'When defining the `%s` operator, name its argument `other`.'
+        MSG = 'When defining the `%s` operator, ' \
+              'name its argument `other`.'.freeze
 
-        OP_LIKE_METHODS = [:eql?, :equal?]
+        OP_LIKE_METHODS = [:eql?, :equal?].freeze
 
-        BLACKLISTED = [:+@, :-@, :[], :[]=, :<<]
+        BLACKLISTED = [:+@, :-@, :[], :[]=, :<<].freeze
 
-        TARGET_ARGS = [s(:args, s(:arg, :other)), s(:args, s(:arg, :_other))]
+        TARGET_ARGS = [s(:args, s(:arg, :other)),
+                       s(:args, s(:arg, :_other))].freeze
 
         def on_def(node)
           name, args, _body = *node

data/lib/rubocop/cop/style/option_hash.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -20,11 +21,9 @@ module RuboCop
       #     ...
       #   end
       class OptionHash < Cop
-        MSG = 'Prefer keyword arguments to options hashes.'
+        MSG = 'Prefer keyword arguments to options hashes.'.freeze
 
         def on_args(node)
-          return unless supports_keyword_arguments?
-
           *_but_last, last_arg = *node
 
           # asserting that there was an argument at all
@@ -48,12 +47,19 @@ module RuboCop
           add_offense(last_arg, :expression, MSG)
         end
 
-        private
-
-        def supports_keyword_arguments?
-          RUBY_VERSION >= '2.0.0'
+        def validate_config
+          if target_ruby_version < 2.0
+            fail ValidationError, 'The `Style/OptionHash` cop is only ' \
+                                  'compatible with Ruby 2.0 and up, but the ' \
+                                  'target Ruby version for your project is ' \
+                                  "1.9.\nPlease disable this cop or adjust " \
+                                  'the `TargetRubyVersion` parameter in your ' \
+                                  'configuration.'
+          end
         end
 
+        private
+
         def name_in_suspicious_param_names?(arg_name)
           cop_config.key?('SuspiciousParamNames') &&
             cop_config['SuspiciousParamNames'].include?(arg_name.to_s)

data/lib/rubocop/cop/style/optional_arguments.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -18,8 +19,8 @@ module RuboCop
       #   def foobar(a = 1, b = 2, c = 3)
       #   end
       class OptionalArguments < Cop
-        MSG =
-          'Optional arguments should appear at the end of the argument list.'
+        MSG = 'Optional arguments should appear at the end ' \
+              'of the argument list.'.freeze
 
         def on_def(node)
           _method, arguments, = *node

data/lib/rubocop/cop/style/parallel_assignment.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'tsort'
 
@@ -25,7 +26,7 @@ module RuboCop
       class ParallelAssignment < Cop
         include IfNode
 
-        MSG = 'Do not use parallel assignment.'
+        MSG = 'Do not use parallel assignment.'.freeze
 
         def on_masgn(node)
           left, right = *node
@@ -99,6 +100,7 @@ module RuboCop
 
           def_node_matcher :var_name, '{(casgn _ $_) (_ $_)}'
           def_node_search :uses_var?, '{({lvar ivar cvar gvar} %) (const _ %)}'
+          def_node_search :matching_calls, '(send %1 %2 $...)'
 
           def initialize(assignments)
             @assignments = assignments
@@ -115,7 +117,23 @@ module RuboCop
 
             @assignments.each do |other|
               _other_lhs, other_rhs = *other
-              yield other if uses_var?(other_rhs, var_name(my_lhs))
+              if ((var = var_name(my_lhs)) && uses_var?(other_rhs, var)) ||
+                 (my_lhs.asgn_method_call? && accesses?(other_rhs, my_lhs))
+                yield other
+              end
+            end
+          end
+
+          # `lhs` is an assignment method call like `obj.attr=` or `ary[idx]=`.
+          # Does `rhs` access the same value which is assigned by `lhs`?
+          def accesses?(rhs, lhs)
+            if lhs.method_name == :[]=
+              matching_calls(rhs, lhs.receiver, :[]).any? do |args|
+                args == lhs.method_args
+              end
+            else
+              access_method = lhs.method_name.to_s.chop.to_sym
+              matching_calls(rhs, lhs.receiver, access_method).any?
             end
           end
         end
@@ -151,25 +169,29 @@ module RuboCop
           end
 
           def correction
-            "#{assignment.join("\n#{offset(node)}")}"
+            assignment.join("\n#{offset(node)}")
           end
 
           def correction_range
-            node.loc.expression
+            node.source_range
           end
 
           protected
 
           def assignment
             @new_elements.map do |lhs, rhs|
-              "#{lhs.loc.expression.source} = #{rhs.loc.expression.source}"
+              "#{lhs.source} = #{rhs.source}"
             end
           end
 
           private
 
           def extract_sources(node)
-            node.children.map { |child| child.loc.expression.source }
+            node.children.map(&:source)
+          end
+
+          def cop_config
+            @config.for_cop('Style/ParallelAssignment')
           end
         end
 
@@ -180,15 +202,16 @@ module RuboCop
             _node, rescue_clause = *node.parent
             _, _, rescue_result = *rescue_clause
 
-            "begin\n" <<
-              indentation(node) << assignment.join("\n#{indentation(node)}") <<
-              "\n#{offset(node)}rescue\n" <<
-              indentation(node) << rescue_result.loc.expression.source <<
+            "begin\n" \
+              "#{indentation(node)}" \
+              "#{assignment.join("\n#{indentation(node)}")}" \
+              "\n#{offset(node)}rescue\n" \
+              "#{indentation(node)}#{rescue_result.source}" \
               "\n#{offset(node)}end"
           end
 
           def correction_range
-            node.parent.loc.expression
+            node.parent.source_range
           end
         end
 
@@ -199,17 +222,18 @@ module RuboCop
             parent = node.parent
 
             modifier_range =
-              Parser::Source::Range.new(parent.loc.expression.source_buffer,
+              Parser::Source::Range.new(parent.source_range.source_buffer,
                                         parent.loc.keyword.begin_pos,
-                                        parent.loc.expression.end_pos)
+                                        parent.source_range.end_pos)
 
-            "#{modifier_range.source}\n" <<
-              indentation(node) << assignment.join("\n#{indentation(node)}") <<
+            "#{modifier_range.source}\n" \
+              "#{indentation(node)}" \
+              "#{assignment.join("\n#{indentation(node)}")}" \
               "\n#{offset(node)}end"
           end
 
           def correction_range
-            node.parent.loc.expression
+            node.parent.source_range
           end
         end
       end

data/lib/rubocop/cop/style/parentheses_around_condition.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -8,6 +9,7 @@ module RuboCop
       class ParenthesesAroundCondition < Cop
         include IfNode
         include SafeAssignment
+        include Parentheses
 
         def on_if(node)
           return if ternary_op?(node)
@@ -31,7 +33,7 @@ module RuboCop
           # handle `if (something rescue something_else) ...`
           return if modifier_op?(cond.children.first)
           # check if there's any whitespace between the keyword and the cond
-          return if parens_required?(node)
+          return if parens_required?(node.children.first)
           # allow safe assignment
           return if safe_assignment?(cond) && safe_assignment_allowed?
 
@@ -46,26 +48,11 @@ module RuboCop
             node.loc.end.nil?
         end
 
-        def parens_required?(node)
-          exp = node.loc.expression
-          kw = node.loc.keyword
-          kw_offset = kw.begin_pos - exp.begin_pos
-
-          exp.source[kw_offset..-1].start_with?(kw.source + '(')
-        end
-
         def message(node)
           kw = node.loc.keyword.source
           article = kw == 'while' ? 'a' : 'an'
           "Don't use parentheses around the condition of #{article} `#{kw}`."
         end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.remove(node.loc.begin)
-            corrector.remove(node.loc.end)
-          end
-        end
       end
     end
   end

data/lib/rubocop/cop/style/percent_literal_delimiters.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -18,7 +19,7 @@ module RuboCop
         def on_str(node)
           process(node, '%', '%Q', '%q')
         end
-        alias_method :on_dstr, :on_str
+        alias on_dstr on_str
 
         def on_sym(node)
           process(node, '%s')
@@ -76,7 +77,7 @@ module RuboCop
           if node.is_a?(String)
             node
           elsif node.respond_to?(:type) && node.type == :str
-            node.loc.expression.source
+            node.source
           end
         end
       end

data/lib/rubocop/cop/style/percent_q_literals.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -27,20 +28,16 @@ module RuboCop
         end
 
         def check(node, msg)
-          src = node.loc.expression.source
           # Report offense only if changing case doesn't change semantics,
           # i.e., if the string would become dynamic or has special characters.
-          return if node.children !=
-                    ProcessedSource.new(corrected(src)).ast.children
+          return if node.children != parse(corrected(node.source)).ast.children
 
           add_offense(node, :begin, msg)
         end
 
         def autocorrect(node)
-          src = node.loc.expression.source
-
           lambda do |corrector|
-            corrector.replace(node.loc.expression, corrected(src))
+            corrector.replace(node.source_range, corrected(node.source))
           end
         end
 

data/lib/rubocop/cop/style/perl_backrefs.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -6,7 +7,7 @@ module RuboCop
       # This cop looks for uses of Perl-style regexp match
       # backreferences like $1, $2, etc.
       class PerlBackrefs < Cop
-        MSG = 'Avoid the use of Perl-style backrefs.'
+        MSG = 'Avoid the use of Perl-style backrefs.'.freeze
 
         def on_nth_ref(node)
           add_offense(node, :expression)
@@ -17,10 +18,10 @@ module RuboCop
             backref, = *node
             parent_type = node.parent ? node.parent.type : nil
             if [:dstr, :xstr, :regexp].include?(parent_type)
-              corrector.replace(node.loc.expression,
+              corrector.replace(node.source_range,
                                 "{Regexp.last_match(#{backref})}")
             else
-              corrector.replace(node.loc.expression,
+              corrector.replace(node.source_range,
                                 "Regexp.last_match(#{backref})")
             end
           end

data/lib/rubocop/cop/style/predicate_name.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop

data/lib/rubocop/cop/style/proc.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -6,7 +7,7 @@ module RuboCop
       # This cops checks for uses of Proc.new where Kernel#proc
       # would be more appropriate.
       class Proc < Cop
-        MSG = 'Use `proc` instead of `Proc.new`.'
+        MSG = 'Use `proc` instead of `Proc.new`.'.freeze
 
         TARGET = s(:send, s(:const, nil, :Proc), :new)
 
@@ -22,7 +23,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          ->(corrector) { corrector.replace(node.loc.expression, 'proc') }
+          ->(corrector) { corrector.replace(node.source_range, 'proc') }
         end
       end
     end

data/lib/rubocop/cop/style/raise_args.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -8,7 +9,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         def on_send(node)
-          return unless command?(:raise, node) || command?(:fail, node)
+          return unless node.command?(:raise) || node.command?(:fail)
 
           case style
           when :compact

data/lib/rubocop/cop/style/redundant_begin.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -27,7 +28,7 @@ module RuboCop
       class RedundantBegin < Cop
         include OnMethodDef
 
-        MSG = 'Redundant `begin` block detected.'
+        MSG = 'Redundant `begin` block detected.'.freeze
 
         def on_method_def(_node, _method_name, _args, body)
           return unless body && body.type == :kwbegin

data/lib/rubocop/cop/style/redundant_exception.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -11,12 +12,12 @@ module RuboCop
       #
       #   raise RuntimeError, 'message'
       class RedundantException < Cop
-        MSG = 'Redundant `RuntimeError` argument can be removed.'
+        MSG = 'Redundant `RuntimeError` argument can be removed.'.freeze
 
         TARGET_NODE = s(:const, nil, :RuntimeError)
 
         def on_send(node)
-          return unless command?(:raise, node) || command?(:fail, node)
+          return unless node.command?(:raise) || node.command?(:fail)
 
           _receiver, _selector, *args = *node
 
@@ -29,9 +30,8 @@ module RuboCop
 
         # switch `raise RuntimeError, 'message'` to `raise 'message'`
         def autocorrect(node)
-          start_range = node.loc.expression.begin
-          no_comma = range_with_surrounding_comma(node.loc.expression.end,
-                                                  :right)
+          start_range = node.source_range.begin
+          no_comma = range_with_surrounding_comma(node.source_range.end, :right)
           comma_range = start_range.join(no_comma)
           final_range = range_with_surrounding_space(comma_range, :right)
           ->(corrector) { corrector.replace(final_range, '') }