RubyGems - rubocop - Versions diffs - 0.43.0 → 0.44.0 - Mend

rubocop 0.43.0 → 0.44.0

Potentially problematic release.

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

Files changed (430) hide show

data/lib/rubocop/cop/metrics/method_length.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -9,7 +8,9 @@ module RuboCop
       # The maximum allowed length is configurable.
       class MethodLength < Cop
         include OnMethodDef
-        include CodeLength
+        include TooManyLines
+        LABEL = 'Method'.freeze
         private
@@ -17,14 +18,8 @@ module RuboCop
           check_code_length(node)
         end
-        def message(length, max_length)
-          format('Method has too many lines. [%d/%d]', length, max_length)
-        end
-        def code_length(node)
-          lines = node.source.lines.to_a[1..-2] || []
-          lines.count { |line| !irrelevant_line(line) }
+        def cop_label
+          LABEL
         end
       end
     end

data/lib/rubocop/cop/metrics/module_length.rb CHANGED

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

data/lib/rubocop/cop/metrics/parameter_lists.rb CHANGED

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

data/lib/rubocop/cop/metrics/perceived_complexity.rb CHANGED

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -15,7 +14,7 @@ module RuboCop
         cop_config['CountComments']
       end
-      def check_code_length(node, *_)
+      def check_code_length(node)
         length = code_length(node)
         return unless length > max_length

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -9,7 +8,8 @@ module RuboCop
       include ConfigurableEnforcedStyle
       SNAKE_CASE = /^@{0,2}[-_a-z]+[_\D]*(_\d)*[!?=]?$/
-      NORMAL_CASE = /^@{0,2}-{0,1}_{0,1}[a-zA-Z\d]*[_\D]*[!?=]?$/
+      NORMAL_CASE = /^@{0,2}-{0,1}_{0,1}[a-zA-Z\d]*(_[a-zA-Z]+\d*)*
+                     [_\D]*[!?=]?$/x
       NON_INTEGER = /^@{0,2}[-_a-z]+[_\D]*[!?=]?$/
       def check_name(node, name, name_range)

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

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

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -7,16 +6,22 @@ module RuboCop
       # Common functionality for checking if presence/absence of empty lines
       # around some kind of body matches the configuration.
       module EmptyLinesAroundBody
+        extend NodePattern::Macros
         include ConfigurableEnforcedStyle
         MSG_EXTRA = 'Extra empty line detected at %s body %s.'.freeze
         MSG_MISSING = 'Empty line missing at %s body %s.'.freeze
-        def autocorrect(range)
+        def_node_matcher :constant_definition?, '{class module}'
+        def autocorrect(args)
+          offence_style, range = args
           lambda do |corrector|
-            case style
-            when :no_empty_lines then corrector.remove(range)
-            when :empty_lines    then corrector.insert_before(range, "\n")
+            case offence_style
+            when :no_empty_lines then
+              corrector.remove(range)
+            when :empty_lines then
+              corrector.insert_before(range, "\n")
             end
           end
         end
@@ -30,33 +35,53 @@ module RuboCop
           return unless body || style == :no_empty_lines
           return if node.single_line?
-          check_source(node.loc.expression.first_line,
-                       node.loc.expression.last_line)
+          first_line = node.source_range.first_line
+          last_line = node.source_range.last_line
+          case style
+          when :empty_lines_except_namespace
+            if namespace?(body, with_one_child: true)
+              check_source(:no_empty_lines, first_line, last_line)
+            else
+              check_source(:empty_lines, first_line, last_line)
+            end
+          else
+            check_source(style, first_line, last_line)
+          end
         end
-        def check_source(start_line, end_line)
+        def check_source(style, start_line, end_line)
           case style
           when :no_empty_lines
-            check_both(start_line, end_line, MSG_EXTRA, &:empty?)
+            check_both(style, start_line, end_line, MSG_EXTRA, &:empty?)
           when :empty_lines
-            check_both(start_line, end_line, MSG_MISSING) do |line|
+            check_both(style, start_line, end_line, MSG_MISSING) do |line|
               !line.empty?
             end
           end
         end
-        def check_both(start_line, end_line, msg, &block)
+        def check_both(style, start_line, end_line, msg, &block)
           kind = self.class::KIND
-          check_line(start_line, format(msg, kind, 'beginning'), &block)
-          check_line(end_line - 2, format(msg, kind, 'end'), &block)
+          check_line(style, start_line, format(msg, kind, 'beginning'), &block)
+          check_line(style, end_line - 2, format(msg, kind, 'end'), &block)
         end
-        def check_line(line, msg)
-          return unless yield processed_source.lines[line]
+        def check_line(style, line, msg)
+          return unless yield(processed_source.lines[line])
           offset = style == :empty_lines && msg.include?('end.') ? 2 : 1
           range = source_range(processed_source.buffer, line + offset, 0)
-          add_offense(range, range, msg)
+          add_offense([style, range], range, msg)
+        end
+        def namespace?(node, with_one_child: true)
+          if node.begin_type?
+            return false if with_one_child
+            node.children.all? { |child| constant_definition?(child) }
+          else
+            constant_definition?(node)
+          end
         end
       end
     end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/rubocop/cop/mixin/too_many_lines.rb ADDED

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module RuboCop
+  module Cop
+    # Common functionality for checking for too many lines.
+    module TooManyLines
+      include ConfigurableMax
+      include CodeLength
+      MSG = '%s has too many lines. [%d/%d]'.freeze
+      private
+      def message(length, max_length)
+        format(MSG, cop_label, length, max_length)
+      end
+      def code_length(node)
+        lines = node.source.lines.to_a[1...-1] || []
+        lines.count { |line| !irrelevant_line(line) }
+      end
+    end
+  end
+end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -85,7 +84,7 @@ module RuboCop
         items = elements(node).map(&:source_range)
         return false if items.empty?
         items << node.loc.begin << node.loc.end
-        (items.map(&:first_line) + items.map(&:last_line)).uniq.count > 1
+        (items.map(&:first_line) + items.map(&:last_line)).uniq.size > 1
       end
       def elements(node)