rubocop 0.35.1 → 0.36.0

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -9,7 +10,7 @@ module RuboCop
         include AutocorrectAlignment
 
         MSG = 'Align the elements of an array literal if they span more ' \
-              'than one line.'
+              'than one line.'.freeze
 
         def on_array(node)
           check_alignment(node.children)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -20,7 +21,7 @@ module RuboCop
           end
 
           def deltas(first_pair, current_pair)
-            if Util.begins_its_line?(current_pair.loc.expression)
+            if Util.begins_its_line?(current_pair.source_range)
               { key: first_pair.loc.column - current_pair.loc.column }
             else
               {}
@@ -31,6 +32,8 @@ module RuboCop
         # Common functionality for the styles where not only keys, but also
         # values are aligned.
         class AlignmentOfValues
+          include HashNode # any_pairs_on_the_same_line?
+
           def checkable_layout(node)
             !any_pairs_on_the_same_line?(node) && all_have_same_separator?(node)
           end
@@ -56,15 +59,9 @@ module RuboCop
             end
           end
 
-          def any_pairs_on_the_same_line?(node)
-            node.children[1..-1].any? do |pair|
-              !Util.begins_its_line?(pair.loc.expression)
-            end
-          end
-
           def all_have_same_separator?(node)
             first_separator = node.children.first.loc.operator.source
-            node.children[1..-1].all? do |pair|
+            node.children.butfirst.all? do |pair|
               pair.loc.operator.is?(first_separator)
             end
           end
@@ -77,7 +74,7 @@ module RuboCop
           def deltas_for_first_pair(first_pair, node)
             key_widths = node.children.map do |pair|
               key, _value = *pair
-              key.loc.expression.source.length
+              key.source.length
             end
             @max_key_width = key_widths.max
 
@@ -128,7 +125,7 @@ module RuboCop
 
           def key_end_column(pair)
             key, _value = *pair
-            key.loc.column + key.loc.expression.source.length
+            key.loc.column + key.source.length
           end
 
           def hash_rocket_delta(first_pair, current_separator)
@@ -143,7 +140,7 @@ module RuboCop
         end
 
         MSG = 'Align the elements of a hash literal if they span more than ' \
-              'one line.'
+              'one line.'.freeze
 
         def on_send(node)
           return unless (last_child = node.children.last) &&
@@ -218,14 +215,16 @@ module RuboCop
           value_delta     = @column_deltas[:value] || 0
 
           key, value = *node
+          key_column = key.source_range.column
+          key_delta = -key_column if key_delta < -key_column
 
           lambda do |corrector|
             if value.nil?
-              adjust(corrector, key_delta, node.loc.expression)
+              adjust(corrector, key_delta, node.source_range)
             else
-              adjust(corrector, key_delta, key.loc.expression)
+              adjust(corrector, key_delta, key.source_range)
               adjust(corrector, separator_delta, node.loc.operator)
-              adjust(corrector, value_delta, value.loc.expression)
+              adjust(corrector, value_delta, value.source_range)
             end
           end
         end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -25,7 +26,7 @@ module RuboCop
         end
 
         def message(node)
-          type = node.parent.send_type? ? 'call' : 'definition'
+          type = node && node.parent.send_type? ? 'call' : 'definition'
           "Align the parameters of a method #{type} if they span " \
           'more than one line.'
         end
@@ -39,7 +40,7 @@ module RuboCop
         def base_column(node, args)
           if fixed_indentation?
             lineno = target_method_lineno(node)
-            line = node.loc.expression.source_buffer.source_line(lineno)
+            line = node.source_range.source_buffer.source_line(lineno)
             indentation_of_line = /\S.*/.match(line).begin(0)
             indentation_of_line + configured_indentation_width
           else

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -8,9 +9,9 @@ module RuboCop
         include AutocorrectUnlessChangingAST
         include ConfigurableEnforcedStyle
 
-        MSG = 'Use `%s` instead of `%s`.'
+        MSG = 'Use `%s` instead of `%s`.'.freeze
 
-        OPS = { 'and' => '&&', 'or' => '||' }
+        OPS = { 'and' => '&&', 'or' => '||' }.freeze
 
         def on_and(node)
           process_logical_op(node) if style == :always
@@ -85,6 +86,7 @@ module RuboCop
 
             if node.loc.selector.source == '!'
               node = receiver
+              return unless node.send_type?
               _receiver, _method_name, *args = *node
             elsif node.loc.selector.source == 'not'
               return correct_other(node, corrector)
@@ -94,17 +96,17 @@ module RuboCop
           end
           return unless correctable_send?(node)
 
-          sb = node.loc.expression.source_buffer
+          sb = node.source_range.source_buffer
           begin_paren = node.loc.selector.end_pos
           range = Parser::Source::Range.new(sb, begin_paren, begin_paren + 1)
           corrector.replace(range, '(')
-          corrector.insert_after(args.last.loc.expression, ')')
+          corrector.insert_after(args.last.source_range, ')')
         end
 
         def correct_other(node, corrector)
-          return unless node.loc.expression.begin.source != '('
-          corrector.insert_before(node.loc.expression, '(')
-          corrector.insert_after(node.loc.expression, ')')
+          return unless node.source_range.begin.source != '('
+          corrector.insert_before(node.source_range, '(')
+          corrector.insert_after(node.source_range, ')')
         end
 
         def correctable_send?(node)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -9,7 +10,7 @@ module RuboCop
       # types, so we consider only cases when the first argument is an
       # array literal or the second is a string literal.
       class ArrayJoin < Cop
-        MSG = 'Favor `Array#join` over `Array#*`.'
+        MSG = 'Favor `Array#join` over `Array#*`.'.freeze
 
         def on_send(node)
           receiver_node, method_name, *arg_nodes = *node
@@ -21,12 +22,11 @@ module RuboCop
 
         def autocorrect(node)
           receiver_node, _method_name, *arg_nodes = *node
-          expr = node.loc.expression
-          array = receiver_node.loc.expression.source
-          join_arg  = arg_nodes[0].loc.expression.source
+          array = receiver_node.source
+          join_arg = arg_nodes[0].source
 
           lambda do |corrector|
-            corrector.replace(expr, "#{array}.join(#{join_arg})")
+            corrector.replace(node.source_range, "#{array}.join(#{join_arg})")
           end
         end
       end

data/lib/rubocop/cop/style/ascii_comments.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 non-ascii (non-English) characters
       # in comments.
       class AsciiComments < Cop
-        MSG = 'Use only ascii symbols in comments.'
+        MSG = 'Use only ascii symbols in comments.'.freeze
 
         def investigate(processed_source)
           processed_source.comments.each do |comment|

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

@@ -1,11 +1,12 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Style
       # This cop checks for non-ascii characters in identifier names.
       class AsciiIdentifiers < Cop
-        MSG = 'Use only ascii symbols in identifiers.'
+        MSG = 'Use only ascii symbols in identifiers.'.freeze
 
         def investigate(processed_source)
           processed_source.tokens.each do |t|

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

@@ -1,20 +1,45 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Style
       # This cop checks for uses of Module#attr.
       class Attr < Cop
-        MSG = 'Do not use `attr`. Use `attr_reader` instead.'
-
         def on_send(node)
-          return unless command?(:attr, node)
+          return unless node.command?(:attr)
           _receiver, _method_name, *args = *node
-          add_offense(node, :selector) if args.any?
+          msg = "Do not use `attr`. Use `#{replacement_method(node)}` instead."
+
+          add_offense(node, :selector, msg) if args.any?
         end
 
         def autocorrect(node)
-          ->(corrector) { corrector.replace(node.loc.selector, 'attr_reader') }
+          _receiver, _method_name, attr_name, setter = *node
+          node_expr = node.source_range
+          attr_expr = attr_name.source_range
+
+          if setter && (setter.true_type? || setter.false_type?)
+            remove = Parser::Source::Range.new(node_expr.source_buffer,
+                                               attr_expr.end_pos,
+                                               node_expr.end_pos)
+          end
+
+          lambda do |corrector|
+            corrector.replace(node.loc.selector, replacement_method(node))
+            corrector.replace(remove, '') if remove
+          end
+        end
+
+        private
+
+        def replacement_method(node)
+          _receiver, _method_name, _attr_name, setter = *node
+          if setter && (setter.true_type? || setter.false_type?)
+            setter.true_type? ? 'attr_accessor' : 'attr_reader'
+          else
+            'attr_reader'
+          end
         end
       end
     end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -17,12 +18,11 @@ module RuboCop
       #     ...
       #   end
       class AutoResourceCleanup < Cop
-        include AST::Sexp
-        MSG = 'Use the block version of `%s.%s`.'
+        MSG = 'Use the block version of `%s.%s`.'.freeze
 
         TARGET_METHODS = [
           [:File, :open]
-        ]
+        ].freeze
 
         def on_send(node)
           receiver_node, method_name, *arg_nodes = *node

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -7,7 +8,7 @@ module RuboCop
       class BarePercentLiterals < Cop
         include ConfigurableEnforcedStyle
 
-        MSG = 'Use `%%%s` instead of `%%%s`.'
+        MSG = 'Use `%%%s` instead of `%%%s`.'.freeze
 
         def on_dstr(node)
           check(node)

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

@@ -1,11 +1,12 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Style
       # This cop checks for BEGIN blocks.
       class BeginBlock < Cop
-        MSG = 'Avoid the use of `BEGIN` blocks.'
+        MSG = 'Avoid the use of `BEGIN` blocks.'.freeze
 
         def on_preexe(node)
           add_offense(node, :keyword)

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

@@ -1,11 +1,12 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Style
       # This cop looks for uses of block comments (=begin...=end).
       class BlockComments < Cop
-        MSG = 'Do not use block comments.'
+        MSG = 'Do not use block comments.'.freeze
         BEGIN_LENGTH = "=begin\n".length
         END_LENGTH = "\n=end".length
 

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -33,7 +34,7 @@ module RuboCop
         private
 
         def line_count_based_message(node)
-          block_length = Util.block_length(node)
+          block_length = block_length(node)
 
           if block_length > 0
             'Avoid using `{...}` for multi-line blocks.'
@@ -53,7 +54,7 @@ module RuboCop
         end
 
         def braces_for_chaining_message(node)
-          block_length = Util.block_length(node)
+          block_length = block_length(node)
 
           if block_length > 0
             if return_value_chaining?(node)
@@ -119,7 +120,7 @@ module RuboCop
         end
 
         def line_count_based_block_style?(node)
-          block_length = Util.block_length(node)
+          block_length = block_length(node)
           block_begin = node.loc.begin.source
 
           if block_length > 0
@@ -143,14 +144,14 @@ module RuboCop
         end
 
         def braces_for_chaining_style?(node)
-          block_length = Util.block_length(node)
+          block_length = block_length(node)
           block_begin = node.loc.begin.source
 
-          if block_length > 0
-            block_begin == (return_value_chaining?(node) ? '{' : 'do')
-          else
-            block_begin == '{'
-          end
+          block_begin == if block_length > 0
+                           (return_value_chaining?(node) ? '{' : 'do')
+                         else
+                           '{'
+                         end
         end
 
         def return_value_chaining?(node)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -25,7 +26,7 @@ module RuboCop
       #     foo(i)
       #   }
       class BlockEndNewline < Cop
-        MSG = 'Expression at %d, %d should be on its own line.'
+        MSG = 'Expression at %d, %d should be on its own line.'.freeze
 
         def on_block(node)
           end_loc = node.loc.end
@@ -33,7 +34,7 @@ module RuboCop
           return if do_loc.line == end_loc.line # Ignore one-liners.
 
           # If the end is on its own line, there is no offense
-          return if /^\s*#{end_loc.source}/.match(end_loc.source_line)
+          return if end_loc.source_line =~ /^\s*#{end_loc.source}/
 
           msg = format(MSG, end_loc.line, end_loc.column + 1)
           add_offense(node, end_loc, msg)

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -9,7 +10,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include AutocorrectUnlessChangingAST
 
-        MSG = '%s curly braces around a hash parameter.'
+        MSG = '%s curly braces around a hash parameter.'.freeze
 
         def on_send(node)
           _receiver, method_name, *args = *node
@@ -29,9 +30,9 @@ module RuboCop
 
         def check(arg, args)
           if style == :braces && !braces?(arg)
-            add_offense(arg.parent, arg.loc.expression, format(MSG, 'Missing'))
+            add_offense(arg.parent, arg.source_range, format(MSG, 'Missing'))
           elsif style == :no_braces && braces?(arg)
-            add_offense(arg.parent, arg.loc.expression,
+            add_offense(arg.parent, arg.source_range,
                         format(MSG, 'Redundant'))
           elsif style == :context_dependent
             check_context_dependent(arg, args)
@@ -42,16 +43,16 @@ module RuboCop
           braces_around_2nd_from_end = args.length > 1 && args[-2].type == :hash
           if braces?(arg)
             unless braces_around_2nd_from_end
-              add_offense(arg.parent, arg.loc.expression,
+              add_offense(arg.parent, arg.source_range,
                           format(MSG, 'Redundant'))
             end
           elsif braces_around_2nd_from_end
-            add_offense(arg.parent, arg.loc.expression, format(MSG, 'Missing'))
+            add_offense(arg.parent, arg.source_range, format(MSG, 'Missing'))
           end
         end
 
         # We let AutocorrectUnlessChangingAST#autocorrect work with the send
-        # node, becuase that context is needed. When parsing the code to see if
+        # node, because that context is needed. When parsing the code to see if
         # the AST has changed, a braceless hash would not be parsed as a hash
         # otherwise.
         def correction(send_node)
@@ -85,8 +86,8 @@ module RuboCop
         end
 
         def add_braces(corrector, node)
-          corrector.insert_before(node.loc.expression, '{')
-          corrector.insert_after(node.loc.expression, '}')
+          corrector.insert_before(node.source_range, '{')
+          corrector.insert_after(node.source_range, '}')
         end
 
         def non_empty_hash?(arg)