rubocop 0.87.1

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

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Layout
+      # This cop checks for Windows-style line endings in the source code.
+      #
+      # @example EnforcedStyle: native (default)
+      #   # The `native` style means that CR+LF (Carriage Return + Line Feed) is
+      #   # enforced on Windows, and LF is enforced on other platforms.
+      #
+      #   # bad
+      #   puts 'Hello' # Return character is LF on Windows.
+      #   puts 'Hello' # Return character is CR+LF on other than Windows.
+      #
+      #   # good
+      #   puts 'Hello' # Return character is CR+LF on Windows.
+      #   puts 'Hello' # Return character is LF on other than Windows.
+      #
+      # @example EnforcedStyle: lf
+      #   # The `lf` style means that LF (Line Feed) is enforced on
+      #   # all platforms.
+      #
+      #   # bad
+      #   puts 'Hello' # Return character is CR+LF on all platfoms.
+      #
+      #   # good
+      #   puts 'Hello' # Return character is LF on all platfoms.
+      #
+      # @example EnforcedStyle: crlf
+      #   # The `crlf` style means that CR+LF (Carriage Return + Line Feed) is
+      #   # enforced on all platforms.
+      #
+      #   # bad
+      #   puts 'Hello' # Return character is LF on all platfoms.
+      #
+      #   # good
+      #   puts 'Hello' # Return character is CR+LF on all platfoms.
+      #
+      class EndOfLine < Cop
+        include ConfigurableEnforcedStyle
+        include RangeHelp
+
+        MSG_DETECTED = 'Carriage return character detected.'
+        MSG_MISSING = 'Carriage return character missing.'
+
+        def investigate(processed_source)
+          last_line = last_line(processed_source)
+
+          processed_source.raw_source.each_line.with_index do |line, index|
+            break if index >= last_line
+
+            msg = offense_message(line)
+            next unless msg
+            next if unimportant_missing_cr?(index, last_line, line)
+
+            range =
+              source_range(processed_source.buffer, index + 1, 0, line.length)
+            add_offense(nil, location: range, message: msg)
+            # Usually there will be carriage return characters on all or none
+            # of the lines in a file, so we report only one offense.
+            break
+          end
+        end
+
+        # If there is no LF on the last line, we don't care if there's no CR.
+        def unimportant_missing_cr?(index, last_line, line)
+          style == :crlf && index == last_line - 1 && !/\n$/.match?(line)
+        end
+
+        def offense_message(line)
+          effective_style = if style == :native
+                              Platform.windows? ? :crlf : :lf
+                            else
+                              style
+                            end
+          case effective_style
+          when :lf then MSG_DETECTED if line.end_with?("\r", "\r\n")
+          else MSG_MISSING unless line.end_with?("\r\n")
+          end
+        end
+
+        private
+
+        def last_line(processed_source)
+          last_token = processed_source.tokens.last
+          last_token ? last_token.line : processed_source.lines.length
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+require 'set'
+
+module RuboCop
+  module Cop
+    module Layout
+      # This cop checks for extra/unnecessary whitespace.
+      #
+      # @example
+      #
+      #   # good if AllowForAlignment is true
+      #   name      = "RuboCop"
+      #   # Some comment and an empty line
+      #
+      #   website  += "/rubocop-hq/rubocop" unless cond
+      #   puts        "rubocop"          if     debug
+      #
+      #   # bad for any configuration
+      #   set_app("RuboCop")
+      #   website  = "https://github.com/rubocop-hq/rubocop"
+      #
+      #   # good only if AllowBeforeTrailingComments is true
+      #   object.method(arg)  # this is a comment
+      #
+      #   # good even if AllowBeforeTrailingComments is false or not set
+      #   object.method(arg) # this is a comment
+      #
+      #   # good with either AllowBeforeTrailingComments or AllowForAlignment
+      #   object.method(arg)         # this is a comment
+      #   another_object.method(arg) # this is another comment
+      #   some_object.method(arg)    # this is some comment
+      class ExtraSpacing < Cop
+        include PrecedingFollowingAlignment
+        include RangeHelp
+
+        MSG_UNNECESSARY = 'Unnecessary spacing detected.'
+        MSG_UNALIGNED_ASGN = '`=` is not aligned with the %<location>s ' \
+                             'assignment.'
+
+        def investigate(processed_source)
+          return if processed_source.blank?
+
+          @corrected = Set.new if force_equal_sign_alignment?
+
+          processed_source.tokens.each_cons(2) do |token1, token2|
+            check_tokens(processed_source.ast, token1, token2)
+          end
+        end
+
+        def autocorrect(range)
+          lambda do |corrector|
+            if range.source.end_with?('=')
+              align_equal_signs(range, corrector)
+            else
+              corrector.remove(range)
+            end
+          end
+        end
+
+        private
+
+        def check_tokens(ast, token1, token2)
+          return if token2.type == :tNL
+
+          if force_equal_sign_alignment? && assignment_tokens.include?(token2)
+            check_assignment(token2)
+          else
+            check_other(token1, token2, ast)
+          end
+        end
+
+        def check_assignment(token)
+          return unless aligned_with_preceding_assignment(token) == :no
+
+          message = format(MSG_UNALIGNED_ASGN, location: 'preceding')
+          add_offense(token.pos, location: token.pos, message: message)
+        end
+
+        def check_other(token1, token2, ast)
+          return false if allow_for_trailing_comments? &&
+                          token2.text.start_with?('#')
+
+          extra_space_range(token1, token2) do |range|
+            next if ignored_range?(ast, range.begin_pos)
+
+            add_offense(range, location: range, message: MSG_UNNECESSARY)
+          end
+        end
+
+        def extra_space_range(token1, token2)
+          return if token1.line != token2.line
+
+          start_pos = token1.end_pos
+          end_pos = token2.begin_pos - 1
+          return if end_pos <= start_pos
+
+          return if allow_for_alignment? && aligned_tok?(token2)
+
+          yield range_between(start_pos, end_pos)
+        end
+
+        def aligned_tok?(token)
+          if token.comment?
+            aligned_comments?(token)
+          else
+            aligned_with_something?(token.pos)
+          end
+        end
+
+        def ignored_range?(ast, start_pos)
+          ignored_ranges(ast).any? { |r| r.include?(start_pos) }
+        end
+
+        # Returns an array of ranges that should not be reported. It's the
+        # extra spaces between the keys and values in a multiline hash,
+        # since those are handled by the Layout/HashAlignment cop.
+        def ignored_ranges(ast)
+          return [] unless ast
+
+          @ignored_ranges ||= on_node(:pair, ast).map do |pair|
+            next if pair.parent.single_line?
+
+            key, value = *pair
+            key.source_range.end_pos...value.source_range.begin_pos
+          end.compact
+        end
+
+        def aligned_comments?(comment_token)
+          ix = processed_source.comments.index do |comment|
+            comment.loc.expression.begin_pos == comment_token.begin_pos
+          end
+          aligned_with_previous_comment?(ix) || aligned_with_next_comment?(ix)
+        end
+
+        def aligned_with_previous_comment?(index)
+          index.positive? && comment_column(index - 1) == comment_column(index)
+        end
+
+        def aligned_with_next_comment?(index)
+          index < processed_source.comments.length - 1 &&
+            comment_column(index + 1) == comment_column(index)
+        end
+
+        def comment_column(index)
+          processed_source.comments[index].loc.column
+        end
+
+        def force_equal_sign_alignment?
+          cop_config['ForceEqualSignAlignment']
+        end
+
+        def align_equal_signs(range, corrector)
+          lines  = all_relevant_assignment_lines(range.line)
+          tokens = assignment_tokens.select { |t| lines.include?(t.line) }
+
+          columns  = tokens.map { |t| align_column(t) }
+          align_to = columns.max
+
+          tokens.each { |token| align_equal_sign(corrector, token, align_to) }
+        end
+
+        def align_equal_sign(corrector, token, align_to)
+          return unless @corrected.add?(token)
+
+          diff = align_to - token.pos.last_column
+
+          if diff.positive?
+            corrector.insert_before(token.pos, ' ' * diff)
+          elsif diff.negative?
+            corrector.remove_preceding(token.pos, -diff)
+          end
+        end
+
+        def all_relevant_assignment_lines(line_number)
+          last_line_number = processed_source.lines.size
+
+          (
+            relevant_assignment_lines(line_number.downto(1)) +
+            relevant_assignment_lines(line_number.upto(last_line_number))
+          )
+            .uniq
+            .sort
+        end
+
+        def align_column(asgn_token)
+          # if we removed unneeded spaces from the beginning of this =,
+          # what column would it end from?
+          line    = processed_source.lines[asgn_token.line - 1]
+          leading = line[0...asgn_token.column]
+          spaces  = leading.size - (leading =~ / *\Z/)
+          asgn_token.pos.last_column - spaces + 1
+        end
+
+        def allow_for_trailing_comments?
+          cop_config['AllowBeforeTrailingComments']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,251 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Layout
+      # This cop checks the indentation of the first argument in a method call.
+      # Arguments after the first one are checked by Layout/ArgumentAlignment,
+      # not by this cop.
+      #
+      # For indenting the first parameter of method _definitions_, check out
+      # Layout/FirstParameterIndentation.
+      #
+      # @example
+      #
+      #   # bad
+      #   some_method(
+      #   first_param,
+      #   second_param)
+      #
+      #   foo = some_method(
+      #   first_param,
+      #   second_param)
+      #
+      #   foo = some_method(nested_call(
+      #   nested_first_param),
+      #   second_param)
+      #
+      #   foo = some_method(
+      #   nested_call(
+      #   nested_first_param),
+      #   second_param)
+      #
+      #   some_method nested_call(
+      #   nested_first_param),
+      #   second_param
+      #
+      # @example EnforcedStyle: consistent
+      #   # The first argument should always be indented one step more than the
+      #   # preceding line.
+      #
+      #   # good
+      #   some_method(
+      #     first_param,
+      #   second_param)
+      #
+      #   foo = some_method(
+      #     first_param,
+      #   second_param)
+      #
+      #   foo = some_method(nested_call(
+      #     nested_first_param),
+      #   second_param)
+      #
+      #   foo = some_method(
+      #     nested_call(
+      #       nested_first_param),
+      #   second_param)
+      #
+      #   some_method nested_call(
+      #     nested_first_param),
+      #   second_param
+      #
+      # @example EnforcedStyle: consistent_relative_to_receiver
+      #   # The first argument should always be indented one level relative to
+      #   # the parent that is receiving the argument
+      #
+      #   # good
+      #   some_method(
+      #     first_param,
+      #   second_param)
+      #
+      #   foo = some_method(
+      #           first_param,
+      #   second_param)
+      #
+      #   foo = some_method(nested_call(
+      #                       nested_first_param),
+      #   second_param)
+      #
+      #   foo = some_method(
+      #           nested_call(
+      #             nested_first_param),
+      #   second_param)
+      #
+      #   some_method nested_call(
+      #                 nested_first_param),
+      #   second_params
+      #
+      # @example EnforcedStyle: special_for_inner_method_call
+      #   # The first argument should normally be indented one step more than
+      #   # the preceding line, but if it's a argument for a method call that
+      #   # is itself a argument in a method call, then the inner argument
+      #   # should be indented relative to the inner method.
+      #
+      #   # good
+      #   some_method(
+      #     first_param,
+      #   second_param)
+      #
+      #   foo = some_method(
+      #     first_param,
+      #   second_param)
+      #
+      #   foo = some_method(nested_call(
+      #                       nested_first_param),
+      #   second_param)
+      #
+      #   foo = some_method(
+      #     nested_call(
+      #       nested_first_param),
+      #   second_param)
+      #
+      #   some_method nested_call(
+      #                 nested_first_param),
+      #   second_param
+      #
+      # @example EnforcedStyle: special_for_inner_method_call_in_parentheses (default)
+      #   # Same as `special_for_inner_method_call` except that the special rule
+      #   # only applies if the outer method call encloses its arguments in
+      #   # parentheses.
+      #
+      #   # good
+      #   some_method(
+      #     first_param,
+      #   second_param)
+      #
+      #   foo = some_method(
+      #     first_param,
+      #   second_param)
+      #
+      #   foo = some_method(nested_call(
+      #                       nested_first_param),
+      #   second_param)
+      #
+      #   foo = some_method(
+      #     nested_call(
+      #       nested_first_param),
+      #   second_param)
+      #
+      #   some_method nested_call(
+      #     nested_first_param),
+      #   second_param
+      #
+      class FirstArgumentIndentation < Cop
+        include Alignment
+        include ConfigurableEnforcedStyle
+        include RangeHelp
+
+        MSG = 'Indent the first argument one step more than %<base>s.'
+
+        def on_send(node)
+          return if !node.arguments? || node.operator_method?
+
+          indent = base_indentation(node) + configured_indentation_width
+
+          check_alignment([node.first_argument], indent)
+        end
+        alias on_csend on_send
+
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, column_delta)
+        end
+
+        private
+
+        def message(arg_node)
+          return 'Bad indentation of the first argument.' unless arg_node
+
+          send_node = arg_node.parent
+          text = base_range(send_node, arg_node).source.strip
+          base = if !/\n/.match?(text) && special_inner_call_indentation?(send_node)
+                   "`#{text}`"
+                 elsif comment_line?(text.lines.reverse_each.first)
+                   'the start of the previous line (not counting the comment)'
+                 else
+                   'the start of the previous line'
+                 end
+
+          format(MSG, base: base)
+        end
+
+        def base_indentation(node)
+          if special_inner_call_indentation?(node)
+            column_of(base_range(node, node.first_argument))
+          else
+            previous_code_line(node.first_argument.first_line) =~ /\S/
+          end
+        end
+
+        def special_inner_call_indentation?(node)
+          return false if style == :consistent
+          return true  if style == :consistent_relative_to_receiver
+
+          parent = node.parent
+
+          return false unless eligible_method_call?(parent)
+          return false if !parent.parenthesized? &&
+                          style == :special_for_inner_method_call_in_parentheses
+
+          # The node must begin inside the parent, otherwise node is the first
+          # part of a chained method call.
+          node.source_range.begin_pos > parent.source_range.begin_pos
+        end
+
+        def_node_matcher :eligible_method_call?, <<~PATTERN
+          (send _ !:[]= ...)
+        PATTERN
+
+        def base_range(send_node, arg_node)
+          range_between(send_node.source_range.begin_pos,
+                        arg_node.source_range.begin_pos)
+        end
+
+        # Returns the column of the given range. For single line ranges, this
+        # is simple. For ranges with line breaks, we look a the last code line.
+        def column_of(range)
+          source = range.source.strip
+          if source.include?("\n")
+            previous_code_line(range.line + source.count("\n") + 1) =~ /\S/
+          else
+            display_column(range)
+          end
+        end
+
+        # Takes the line number of a given code line and returns a string
+        # containing the previous line that's not a comment line or a blank
+        # line.
+        def previous_code_line(line_number)
+          line = ''
+          while line.blank? || comment_lines.include?(line_number)
+            line_number -= 1
+            line = processed_source.lines[line_number - 1]
+          end
+          line
+        end
+
+        def comment_lines
+          @comment_lines ||=
+            processed_source
+            .comments
+            .select { |c| begins_its_line?(c.loc.expression) }
+            .map { |c| c.loc.line }
+        end
+
+        def on_new_investigation
+          @comment_lines = nil
+        end
+      end
+    end
+  end
+end