rubocop 0.35.1 → 0.36.0

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -9,7 +10,7 @@ module RuboCop
       # To avoid false positives, it ignores cases in which we cannot know
       # for certain the type of value that would be assigned to a constant.
       class ConstantName < Cop
-        MSG = 'Use SCREAMING_SNAKE_CASE for constants.'
+        MSG = 'Use SCREAMING_SNAKE_CASE for constants.'.freeze
         SNAKE_CASE = /^[\dA-Z_]+$/
 
         def on_casgn(node)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -61,7 +62,7 @@ module RuboCop
           notice_regexp = Regexp.new(notice)
           processed_source.tokens.each do |token|
             break unless token.type == :tCOMMENT
-            notice_found = !((token.text =~ notice_regexp).nil?)
+            notice_found = !(token.text =~ notice_regexp).nil?
             break if notice_found
           end
           notice_found
@@ -75,11 +76,11 @@ module RuboCop
             "match Notice /#{notice}/" unless autocorrect_notice =~ regex
 
           lambda do |corrector|
-            if token.nil?
-              range = Parser::Source::Range.new('', 0, 0)
-            else
-              range = token.pos
-            end
+            range = if token.nil?
+                      Parser::Source::Range.new('', 0, 0)
+                    else
+                      token.pos
+                    end
             corrector.insert_before(range, "#{autocorrect_notice}\n")
           end
         end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -10,7 +11,7 @@ module RuboCop
         include OnMethodDef
 
         MSG = "Omit the parentheses in defs when the method doesn't accept " \
-              'any arguments.'
+              'any arguments.'.freeze
 
         def on_method_def(node, _method_name, args, _body)
           start_line = node.loc.keyword.line

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -6,9 +7,9 @@ module RuboCop
       # This cop checks for uses of the deprecated methods Hash#has_key?
       # and Hash#has_value?
       class DeprecatedHashMethods < Cop
-        MSG = '`Hash#%s` is deprecated in favor of `Hash#%s`.'
+        MSG = '`Hash#%s` is deprecated in favor of `Hash#%s`.'.freeze
 
-        DEPRECATED_METHODS = [:has_key?, :has_value?]
+        DEPRECATED_METHODS = [:has_key?, :has_value?].freeze
 
         def on_send(node)
           _receiver, method_name, *args = *node

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -6,7 +7,7 @@ module RuboCop
       # This cop checks for missing top-level documentation of
       # classes and modules. Classes with no body are exempt from the
       # check and so are namespace modules - modules that have nothing in
-      # their bodies except classes or other modules.
+      # their bodies except classes, other modules, or constant definitions.
       #
       # The documentation requirement is annulled if the class or module has
       # a "#:nodoc:" comment next to it. Likewise, "#:nodoc: all" does the
@@ -14,7 +15,9 @@ module RuboCop
       class Documentation < Cop
         include AnnotationComment
 
-        MSG = 'Missing top-level %s documentation comment.'
+        MSG = 'Missing top-level %s documentation comment.'.freeze
+
+        def_node_matcher :constant_definition?, '{class module casgn}'
 
         def investigate(processed_source)
           ast = processed_source.ast
@@ -47,21 +50,14 @@ module RuboCop
           end
         end
 
-        # 'Const = Class.new' or 'Const = Module.new' are module definitions
-        mod_new = '(send (const nil {:Class :Module}) :new ...)'
-        def_node_matcher :module_definition?,
-                         "{class
-                           module
-                           (casgn _ _ {#{mod_new} (block #{mod_new} ...)})}"
-
         def namespace?(body_node)
           return false unless body_node
 
           case body_node.type
           when :begin
-            body_node.children.all? { |node| module_definition?(node) }
+            body_node.children.all? { |node| constant_definition?(node) }
           else
-            module_definition?(body_node)
+            constant_definition?(body_node)
           end
         end
 

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -32,7 +33,7 @@ module RuboCop
         def proper_dot_position?(node)
           receiver, _method_name, *_args = *node
 
-          receiver_line = receiver.loc.expression.end.line
+          receiver_line = receiver.source_range.end.line
 
           if node.loc.selector
             selector_line = node.loc.selector.line
@@ -73,7 +74,7 @@ module RuboCop
             when :leading
               corrector.insert_before(selector, '.')
             when :trailing
-              corrector.insert_after(receiver.loc.expression, '.')
+              corrector.insert_after(receiver.source_range, '.')
             end
           end
         end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -20,7 +21,7 @@ module RuboCop
       # As you're unlikely to write code that can accept values of any type
       # this is rarely a problem in practice.
       class DoubleNegation < Cop
-        MSG = 'Avoid the use of double negation (`!!`).'
+        MSG = 'Avoid the use of double negation (`!!`).'.freeze
 
         def_node_matcher :double_negative?, '(send (send _ :!) :!)'
 

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -17,8 +18,8 @@ module RuboCop
       #   # good
       #   [1, 2].each_with_object({}) { |e, a| a[e] = e }
       class EachWithObject < Cop
-        MSG = 'Use `each_with_object` instead of `%s`.'
-        METHODS = [:inject, :reduce]
+        MSG = 'Use `each_with_object` instead of `%s`.'.freeze
+        METHODS = [:inject, :reduce].freeze
 
         def on_block(node)
           method, args, body = *node
@@ -29,7 +30,7 @@ module RuboCop
           _, method_name, method_arg = *method
 
           return unless METHODS.include? method_name
-          return if method_arg && BASIC_LITERALS.include?(method_arg.type)
+          return if method_arg && method_arg.basic_literal?
 
           return_value = return_value(body)
           return unless return_value

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -12,7 +13,7 @@ module RuboCop
         include AutocorrectAlignment
         include CheckAssignment
 
-        MSG = 'Align `%s` with `%s`.'
+        MSG = 'Align `%s` with `%s`.'.freeze
 
         def on_if(node, base = nil)
           return if ignored_node?(node)
@@ -59,7 +60,7 @@ module RuboCop
 
         def base_range(node, base)
           if base
-            base.loc.expression
+            base.source_range
           else
             base = node
             until %w(if unless).include?(base.loc.keyword.source)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -69,7 +70,7 @@ module RuboCop
         include OnNormalIfUnless
         include ConfigurableEnforcedStyle
 
-        MSG = 'Redundant `else`-clause.'
+        MSG = 'Redundant `else`-clause.'.freeze
 
         def on_normal_if_unless(node)
           check(node, if_else_clause(node))
@@ -118,9 +119,9 @@ module RuboCop
             end_pos = if node.loc.end
                         node.loc.end.begin_pos
                       else
-                        node.loc.expression.end_pos + 1
+                        node.source_range.end_pos + 1
                       end
-            range = Parser::Source::Range.new(node.loc.expression.source_buffer,
+            range = Parser::Source::Range.new(node.source_range.source_buffer,
                                               node.loc.else.begin_pos,
                                               end_pos)
             corrector.remove(range)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -7,7 +8,7 @@ module RuboCop
       # separated by empty lines.
       class EmptyLineBetweenDefs < Cop
         include OnMethodDef
-        MSG = 'Use empty lines between method definitions.'
+        MSG = 'Use empty lines between method definitions.'.freeze
 
         def on_method_def(node, _method_name, _args, _body)
           return unless node.parent && node.parent.begin_type?

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

@@ -1,21 +1,27 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
+require 'set'
 
 module RuboCop
   module Cop
     module Style
       # This cops checks for two or more consecutive blank lines.
       class EmptyLines < Cop
-        MSG = 'Extra blank line detected.'
+        MSG = 'Extra blank line detected.'.freeze
         LINE_OFFSET = 2
 
         def investigate(processed_source)
           return if processed_source.tokens.empty?
 
-          prev_line = 1
+          lines = Set.new
+          processed_source.tokens.each do |token|
+            lines << token.pos.line
+          end
 
-          processed_source.tokens.sort_by { |t| t.pos.line }.each do |token|
-            cur_line = token.pos.line
+          prev_line = 1
 
+          lines.sort.each do |cur_line|
             line_diff = cur_line - prev_line
 
             if line_diff > LINE_OFFSET

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -7,7 +8,7 @@ module RuboCop
       class EmptyLinesAroundAccessModifier < Cop
         include AccessModifierNode
 
-        MSG = 'Keep a blank line before and after `%s`.'
+        MSG = 'Keep a blank line before and after `%s`.'.freeze
 
         def on_send(node)
           return unless modifier_node?(node)
@@ -25,8 +26,8 @@ module RuboCop
 
             line = Parser::Source::Range.new(
               processed_source.buffer,
-              node.loc.expression.begin_pos - node.loc.column,
-              node.loc.expression.end_pos
+              node.source_range.begin_pos - node.loc.column,
+              node.source_range.end_pos
             )
 
             unless previous_line_empty?(previous_line)
@@ -41,6 +42,12 @@ module RuboCop
 
         private
 
+        def previous_line_ignoring_comments(processed_source, send_line)
+          processed_source[0..send_line - 2].reverse.find do |line|
+            !comment_line?(line)
+          end
+        end
+
         def previous_line_empty?(previous_line)
           block_start?(previous_line.lstrip) ||
             class_def?(previous_line.lstrip) ||
@@ -53,14 +60,15 @@ module RuboCop
 
         def empty_lines_around?(node)
           send_line = node.loc.line
-          previous_line = processed_source[send_line - 2]
+          previous_line = previous_line_ignoring_comments(processed_source,
+                                                          send_line)
           next_line = processed_source[send_line]
 
           previous_line_empty?(previous_line) && next_line_empty?(next_line)
         end
 
         def class_def?(line)
-          %w(class module).any? { |keyword| line.start_with?(keyword) }
+          line.start_with?('class', 'module')
         end
 
         def block_start?(line)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -16,15 +17,18 @@ module RuboCop
       class EmptyLinesAroundBlockBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = 'block'
+        KIND = 'block'.freeze
 
         def on_block(node)
-          check(node)
+          _send, _args, body = *node
+          check(node, body)
         end
 
         private
 
-        def check(node)
+        def check(node, body)
+          return unless body || style == :no_empty_lines
+
           start_line = node.loc.begin.line
           end_line = node.loc.end.line
 

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -19,14 +20,16 @@ module RuboCop
       class EmptyLinesAroundClassBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = 'class'
+        KIND = 'class'.freeze
 
         def on_class(node)
-          check(node)
+          _name, _superclass, body = *node
+          check(node, body)
         end
 
         def on_sclass(node)
-          check(node)
+          _obj, body = *node
+          check(node, body)
         end
       end
     end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -17,12 +18,12 @@ module RuboCop
         include EmptyLinesAroundBody
         include OnMethodDef
 
-        KIND = 'method'
+        KIND = 'method'.freeze
 
         private
 
-        def on_method_def(node, _method_name, _args, _body)
-          check(node)
+        def on_method_def(node, _method_name, _args, body)
+          check(node, body)
         end
 
         # Override ConfigurableEnforcedStyle#style and hard-code

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -19,10 +20,11 @@ module RuboCop
       class EmptyLinesAroundModuleBody < Cop
         include EmptyLinesAroundBody
 
-        KIND = 'module'
+        KIND = 'module'.freeze
 
         def on_module(node)
-          check(node)
+          _name, body = *node
+          check(node, body)
         end
       end
     end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -6,9 +7,9 @@ module RuboCop
       # This cop checks for the use of a method, the result of which
       # would be a literal, like an empty array, hash or string.
       class EmptyLiteral < Cop
-        ARR_MSG = 'Use array literal `[]` instead of `Array.new`.'
-        HASH_MSG = 'Use hash literal `{}` instead of `Hash.new`.'
-        STR_MSG = "Use string literal `''` instead of `String.new`."
+        ARR_MSG = 'Use array literal `[]` instead of `Array.new`.'.freeze
+        HASH_MSG = 'Use hash literal `{}` instead of `Hash.new`.'.freeze
+        STR_MSG = "Use string literal `''` instead of `String.new`.".freeze
 
         # Empty array node
         #
@@ -54,9 +55,23 @@ module RuboCop
                    return if first_arg_in_method_call_without_parentheses?(node)
                    '{}'
                  when STR_NODE
-                   "''"
+                   if enforce_double_quotes?
+                     '""'
+                   else
+                     "''"
+                   end
                  end
-          ->(corrector) { corrector.replace(node.loc.expression, name) }
+          ->(corrector) { corrector.replace(node.source_range, name) }
+        end
+
+        private
+
+        def enforce_double_quotes?
+          string_literals_config['EnforcedStyle'] == 'double_quotes'
+        end
+
+        def string_literals_config
+          config.for_cop('Style/StringLiterals')
         end
 
         def first_arg_in_method_call_without_parentheses?(node)