rubocop-sorbet 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc9a9caf478aaa31d5b985064aadc77e9e2d199927b7db01eb5823ea2190c28
-  data.tar.gz: d440f179cff018d9ff54d68c01fafa9265d4020ca738f5311fe552b44c7d2074
+  metadata.gz: 1cf8cfdff3aedba93731774d5f47fd8c4f10ef8d615ea2cb9f4cdfd2f20d1522
+  data.tar.gz: 69b6974d9a6de86eeed4b29dcfcae25648a3880036b49ceb57a426821da4535c
 SHA512:
-  metadata.gz: b046329f103125db498e57acb613d387b780c6ec00c3d433cdb88e90ed1110091f5c6a1f59f0d3907abc98e1755ef332046b545b8dd54665939d997716ecf057
-  data.tar.gz: 68348b3e0ad4a8a6141526fb6c5406b42e7ea12661256f83258551b2a11c3a6c04ded7843b7398a4903fa9877cbd16c1acb4bf7f3ccce69c600fca5bc51b18bc
+  metadata.gz: 98a957ed012dcfefb642d54ee332d1435c0931bafe6fa07e2d36d280b7a1c4391bab2f05d2b77b1f44da850196a7edb322886b0d50bbe154e0e6d9d80a9f8f62
+  data.tar.gz: 25634e48e2daf8db8b41211d64f49560f9ddcd7236cc181364e7ab6ecc67cbdcd5d169454825a92ffebb2e6337ed81c1847d54483f0a073447034333c2b4b150

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -11,10 +11,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
     name: Test Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
     name: Lint & Docs
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           stale-pr-message: >
             This PR has been automatically marked as stale because it has not had

data/.rubocop.yml

@@ -7,7 +7,6 @@ require:
   - rubocop/cop/internal_affairs
 
 AllCops:
-  TargetRubyVersion: 2.7
   Exclude:
     - vendor/**/*
   NewCops: disable

data/.ruby-version

@@ -0,0 +1 @@
+3.2.0

data/Gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in rubocop-sorbet.gemspec
 gemspec
 
-gem "byebug"
+gem "debug"
 gem "rake", ">= 12.3.3"
-gem "rspec", "~> 3.7"
+gem "rspec", "~> 3.13"
 gem "rubocop-shopify", require: false
 gem "yard", "~> 0.9"

data/Gemfile.lock

@@ -1,65 +1,78 @@
 PATH
   remote: .
   specs:
-    rubocop-sorbet (0.8.0)
+    rubocop-sorbet (0.8.2)
       rubocop (>= 0.90.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    byebug (11.1.3)
-    diff-lcs (1.3)
-    json (2.6.3)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.5.1)
+    io-console (0.7.2)
+    irb (1.12.0)
+      rdoc
+      reline (>= 0.4.2)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    racc (1.7.1)
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.1)
-    regexp_parser (2.8.1)
+    rake (13.2.1)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.0)
+    reline (0.5.1)
+      io-console (~> 0.5)
     rexml (3.2.6)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (1.55.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-shopify (2.14.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    unicode-display_width (2.4.2)
+    stringio (3.1.0)
+    unicode-display_width (2.5.0)
     yard (0.9.36)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
+  debug
   rake (>= 12.3.3)
-  rspec (~> 3.7)
+  rspec (~> 3.13)
   rubocop-shopify
   rubocop-sorbet!
   yard (~> 0.9)

data/config/default.yml

@@ -200,11 +200,6 @@ Sorbet/BuggyObsoleteStrictMemoization:
   Safe: true
   SafeAutoCorrect: false
 
-Sorbet/OneAncestorPerLine:
-  Description: 'Enforces one ancestor per call to requires_ancestor'
-  Enabled: false
-  VersionAdded: '0.6.0'
-
 Sorbet/RedundantExtendTSig:
   Description: >-
     Forbid the usage of redundant `extend T::Sig`.
@@ -312,3 +307,13 @@ Sorbet/VoidCheckedTests:
   Description: 'Forbid `.void.checked(:tests)`'
   Enabled: true
   VersionAdded: 0.7.7
+
+Sorbet/MultipleTEnumValues:
+  Description: 'Ensures that all `T::Enum`s have multiple values.'
+  Enabled: true
+  VersionAdded: 0.8.2
+
+Sorbet/ForbidComparableTEnum:
+  Description: 'Disallows including the `Comparable` module in a `T::Enum`.'
+  Enabled: true
+  VersionAdded: 0.8.2

data/config/obsoletion.yml

@@ -0,0 +1,8 @@
+#
+# Configuration for obsoletion.
+#
+# See: https://docs.rubocop.org/rubocop/extensions.html#config-obsoletions
+#
+removed:
+  Sorbet/OneAncestorPerLine:
+    reason: '`require_ancestor` now takes a block instead of arguments'

data/config/rbi.yml

@@ -2,7 +2,6 @@ require:
   - rubocop-sorbet
 
 AllCops:
-  TargetRubyVersion: 3.0
   DisabledByDefault: true
   Include:
     - '**/*.rbi'

data/dev.yml

@@ -3,7 +3,7 @@ name: "rubocop-sorbet"
 type: "ruby"
 
 up:
-  - ruby: "3.2.0"
+  - ruby
   - "bundler"
 
 commands:

data/lib/rubocop/cop/sorbet/buggy_obsolete_strict_memoization.rb

@@ -48,8 +48,8 @@ module RuboCop
 
         include TargetSorbetVersion
 
-        MSG = "This might be a mistaken variant of the two-stage workaround that used to be needed for memoization in "\
-          "`#typed: strict` files. See https://sorbet.org/docs/type-assertions#put-type-assertions-behind-memoization."
+        MSG = "This might be a mistaken variant of the two-stage workaround that used to be needed for memoization " \
+          "in `#typed: strict` files. See https://sorbet.org/docs/type-assertions#put-type-assertions-behind-memoization."
 
         # @!method buggy_legacy_memoization_pattern?(node)
         def_node_matcher :buggy_legacy_memoization_pattern?, <<~PATTERN

data/lib/rubocop/cop/sorbet/callback_conditionals_binding.rb

@@ -32,8 +32,13 @@ module RuboCop
       #       true
       #     end
       #   end
-      class CallbackConditionalsBinding < RuboCop::Cop::Cop # rubocop:todo InternalAffairs/InheritDeprecatedCopClass
-        CALLBACKS = [
+      class CallbackConditionalsBinding < RuboCop::Cop::Base
+        extend AutoCorrector
+        include Alignment
+
+        MSG = "Callback conditionals should be bound to the right type. Use T.bind(self, %{type})"
+
+        RESTRICT_ON_SEND = [
           :validate,
           :validates,
           :validates_with,
@@ -72,97 +77,56 @@ module RuboCop
           :append_after_action,
         ].freeze
 
-        def autocorrect(node)
-          lambda do |corrector|
-            options = node.each_child_node.find(&:hash_type?)
-
-            conditional = nil
-            options.each_pair do |keyword, block|
-              if keyword.value == :if || keyword.value == :unless
-                conditional = block
-                break
-              end
-            end
-
-            _, _, block = conditional.child_nodes
-
-            # Find the class node and check if it includes a namespace on the
-            # same line e.g.: Namespace::Class, which will require the fully
-            # qualified name
-
-            klass = node.ancestors.find(&:class_type?)
-
-            expected_class = if klass.children.first.children.first.nil?
-              node.parent_module_name.split("::").last
-            else
-              klass.identifier.source
-            end
-
-            do_end_lambda = conditional.source.include?("do") && conditional.source.include?("end")
+        # @!method argumentless_unbound_callable_callback_conditional?(node)
+        def_node_matcher :argumentless_unbound_callable_callback_conditional?, <<~PATTERN
+          (pair (sym {:if :unless})                          # callback conditional
+            $(block
+              (send nil? {:lambda :proc})                    # callable
+              (args)                                         # argumentless
+              !`(send(const {cbase nil?} :T) :bind self $_ ) # unbound
+            )
+          )
+        PATTERN
 
-            unless do_end_lambda
-              # We are converting a one line lambda into a multiline
-              # Remove the space after the `{`
-              if /{\s/.match?(conditional.source)
-                corrector.remove_preceding(block, 1)
+        def on_send(node)
+          type = immediately_enclosing_module_name(node)
+          return unless type
+
+          node.arguments.each do |arg|
+            next unless arg.hash_type? # Skip non-keyword arguments
+
+            arg.each_child_node do |pair_node|
+              argumentless_unbound_callable_callback_conditional?(pair_node) do |block|
+                add_offense(pair_node, message: format(MSG, type: type)) do |corrector|
+                  block_opening_indentation = block.source_range.source_line[/\A */]
+                  block_body_indentation    = block_opening_indentation + SPACE * configured_indentation_width
+
+                  if block.single_line? # then convert to multi-line block first
+                    # 1. Replace whitespace (if any) between the opening delimiter and the block body,
+                    #    with newline and the correct indentation for the block body.
+                    preceeding_whitespace_range = block.loc.begin.end.join(block.body.source_range.begin)
+                    corrector.replace(preceeding_whitespace_range, "\n#{block_body_indentation}")
+
+                    # 2. Replace whitespace (if any) between the block body and the closing delimiter,
+                    #    with newline and the same indentation as the block opening.
+                    trailing_whitespace_range = block.body.source_range.end.join(block.loc.end.begin)
+                    corrector.replace(trailing_whitespace_range, "\n#{block_opening_indentation}")
+                  end
+
+                  # Prepend the binding to the block body
+                  corrector.insert_before(block.body, "T.bind(self, #{type})\n#{block_body_indentation}")
+                end
               end
-
-              # Remove the last space and `}` and re-add it with a line break
-              # and the correct indentation
-              base_indentation = " " * node.loc.column
-              chars_to_remove = /\s}/.match?(conditional.source) ? 2 : 1
-              corrector.remove_trailing(conditional, chars_to_remove)
-              corrector.insert_after(block, "\n#{base_indentation}}")
             end
-
-            # Add the T.bind
-            indentation = " " * (node.loc.column + 2)
-            line_start = do_end_lambda ? "" : "\n#{indentation}"
-            bind = "#{line_start}T.bind(self, #{expected_class})\n#{indentation}"
-
-            corrector.insert_before(block, bind)
           end
         end
 
-        def on_send(node)
-          return unless CALLBACKS.include?(node.method_name)
-
-          options = node.each_child_node.find(&:hash_type?)
-          return if options.nil?
-
-          conditional = nil
-          options.each_pair do |keyword, block|
-            next unless keyword.sym_type?
-
-            if keyword.value == :if || keyword.value == :unless
-              conditional = block
-              break
-            end
-          end
-
-          return if conditional.nil? || conditional.array_type? || conditional.child_nodes.empty?
-
-          return unless conditional.arguments.empty?
+        private
 
-          type, _, block = conditional.child_nodes
-          return unless type.lambda_or_proc? || type.block_literal?
-
-          klass = node.ancestors.find(&:class_type?)
-
-          expected_class = if klass&.children&.first&.children&.first.nil?
-            node.parent_module_name&.split("::")&.last
-          else
-            klass.identifier.source
-          end
-
-          return if expected_class.nil?
-
-          unless block.source.include?("T.bind(self")
-            add_offense(
-              node,
-              message: "Callback conditionals should be bound to the right type. Use T.bind(self, #{expected_class})",
-            )
-          end
+        # Find the immediately enclosing class or module name.
+        # Returns `nil`` if the immediate parent (skipping begin if present) is not a class or module.
+        def immediately_enclosing_module_name(node)
+          (node.parent&.begin_type? ? node.parent.parent : node.parent)&.defined_module_name
         end
       end
     end

data/lib/rubocop/cop/sorbet/constants_from_strings.rb

@@ -33,21 +33,18 @@ module RuboCop
       #
       #   # good
       #   { "User" => User }.fetch(class_name)
-      class ConstantsFromStrings < ::RuboCop::Cop::Cop # rubocop:todo InternalAffairs/InheritDeprecatedCopClass
-        # @!method constant_from_string?(node)
-        def_node_matcher(:constant_from_string?, <<-PATTERN)
-          (send _ {:constantize :constants :const_get} ...)
-        PATTERN
+      class ConstantsFromStrings < ::RuboCop::Cop::Base
+        MSG = "Don't use `%<method_name>s`, it makes the code harder to understand, less editor-friendly, " \
+          "and impossible to analyze. Replace `%<method_name>s` with a case/when or a hash."
 
-        def on_send(node)
-          return unless constant_from_string?(node)
+        RESTRICT_ON_SEND = [
+          :constantize,
+          :constants,
+          :const_get,
+        ].freeze
 
-          add_offense(
-            node,
-            location: :selector,
-            message: "Don't use `#{node.method_name}`, it makes the code harder to understand, less editor-friendly, " \
-              "and impossible to analyze. Replace `#{node.method_name}` with a case/when or a hash.",
-          )
+        def on_send(node)
+          add_offense(node.selector, message: format(MSG, method_name: node.method_name))
         end
       end
     end

data/lib/rubocop/cop/sorbet/forbid_t_struct.rb

@@ -79,7 +79,7 @@ module RuboCop
             return unless t_struct_prop?(node)
 
             kind = node.method?(:const) ? :attr_reader : :attr_accessor
-            name = node.arguments[0].source.delete_prefix(":")
+            name = node.first_argument.source.delete_prefix(":")
             type = node.arguments[1].source
             default = nil
             factory = nil

data/lib/rubocop/cop/sorbet/mixin/t_enum.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sorbet
+      # Mixing for writing cops that deal with `T::Enum`s
+      module TEnum
+        extend RuboCop::NodePattern::Macros
+        def initialize(*)
+          @scopes = []
+          super
+        end
+
+        # @!method t_enum?(node)
+        def_node_matcher :t_enum?, <<~PATTERN
+          (class (const...) (const (const nil? :T) :Enum) ...)
+        PATTERN
+
+        def on_class(node)
+          @scopes.push(node)
+        end
+
+        def after_class(node)
+          @scopes.pop
+        end
+
+        private
+
+        def in_t_enum_class?
+          t_enum?(@scopes&.last)
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/sorbet/sigils/valid_sigil.rb

@@ -29,7 +29,8 @@ module RuboCop
           strictness = extract_strictness(sigil)
           return unless check_strictness_not_empty(sigil, strictness)
           return unless check_strictness_valid(sigil, strictness)
-          return unless check_strictness_level(sigil, strictness)
+
+          nil unless check_strictness_level(sigil, strictness)
         end
 
         def autocorrect(_node)

data/lib/rubocop/cop/sorbet/t_enum/forbid_comparable_t_enum.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sorbet
+      # Disallow including the `Comparable` module in `T::Enum`.
+      #
+      # @example
+      #
+      #  # bad
+      #  class Priority < T::Enum
+      #    include Comparable
+      #
+      #    enums do
+      #      High = new(3)
+      #      Medium = new(2)
+      #      Low = new(1)
+      #    end
+      #
+      #    def <=>(other)
+      #      serialize <=> other.serialize
+      #    end
+      #  end
+      class ForbidComparableTEnum < Base
+        include TEnum
+
+        MSG = "Do not use `T::Enum` as a comparable object because of significant performance overhead."
+
+        RESTRICT_ON_SEND = [:include, :prepend].freeze
+
+        # @!method mix_in_comparable?(node)
+        def_node_matcher :mix_in_comparable?, <<~PATTERN
+          (send nil? {:include | :prepend} (const nil? :Comparable))
+        PATTERN
+
+        def on_send(node)
+          return unless in_t_enum_class? && mix_in_comparable?(node)
+
+          add_offense(node)
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/sorbet/t_enum/multiple_t_enum_values.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sorbet
+      # Disallow creating a `T::Enum` with less than two values.
+      #
+      # @example
+      #
+      #  # bad
+      #  class ErrorMessages < T::Enum
+      #    enums do
+      #      ServerError = new("There was a server error.")
+      #    end
+      #  end
+      #
+      #  # good
+      #  class ErrorMessages < T::Enum
+      #    enums do
+      #      ServerError = new("There was a server error.")
+      #      NotFound = new("The resource was not found.")
+      #    end
+      #  end
+      class MultipleTEnumValues < Base
+        include TEnum
+
+        MSG = "`T::Enum` should have at least two values."
+
+        # @!method enums_block?(node)
+        def_node_matcher :enums_block?, <<~PATTERN
+          (block (send nil? :enums) ...)
+        PATTERN
+
+        def on_class(node)
+          super
+
+          add_offense(node) if t_enum?(node) && node.body.nil?
+        end
+
+        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
+          return unless in_t_enum_class?
+          return unless enums_block?(node)
+
+          scope = @scopes.last
+
+          if node.body.nil?
+            add_offense(scope)
+            return
+          end
+
+          begin_node = node.children.find(&:begin_type?)
+
+          num_casgn_nodes = (begin_node || node).children.count(&:casgn_type?)
+          add_offense(scope) if num_casgn_nodes < 2
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/sorbet_cops.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "sorbet/mixin/target_sorbet_version.rb"
-require_relative "sorbet/mixin/signature_help.rb"
+require_relative "sorbet/mixin/target_sorbet_version"
+require_relative "sorbet/mixin/t_enum"
+require_relative "sorbet/mixin/signature_help"
 
 require_relative "sorbet/binding_constant_without_type_alias"
 require_relative "sorbet/constants_from_strings"
@@ -10,7 +11,6 @@ require_relative "sorbet/forbid_include_const_literal"
 require_relative "sorbet/forbid_type_aliased_shapes"
 require_relative "sorbet/forbid_untyped_struct_props"
 require_relative "sorbet/implicit_conversion_method"
-require_relative "sorbet/one_ancestor_per_line"
 require_relative "sorbet/callback_conditionals_binding"
 require_relative "sorbet/forbid_t_struct"
 require_relative "sorbet/forbid_t_unsafe"
@@ -42,4 +42,7 @@ require_relative "sorbet/sigils/strong_sigil"
 require_relative "sorbet/sigils/enforce_sigil_order"
 require_relative "sorbet/sigils/enforce_single_sigil"
 
+require_relative "sorbet/t_enum/forbid_comparable_t_enum"
+require_relative "sorbet/t_enum/multiple_t_enum_values"
+
 require_relative "sorbet/mutable_constant_sorbet_aware_behaviour"

data/lib/rubocop/sorbet/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Sorbet
-    VERSION = "0.8.0"
+    VERSION = "0.8.2"
   end
 end

data/lib/rubocop/sorbet.rb

@@ -12,5 +12,7 @@ module RuboCop
     CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read).freeze
 
     private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
+
+    ::RuboCop::ConfigObsoletion.files << PROJECT_ROOT.join("config", "obsoletion.yml")
   end
 end

data/manual/cops.md

@@ -16,6 +16,7 @@ In the following section you find all available cops:
 * [Sorbet/EnforceSignatures](cops_sorbet.md#sorbetenforcesignatures)
 * [Sorbet/EnforceSingleSigil](cops_sorbet.md#sorbetenforcesinglesigil)
 * [Sorbet/FalseSigil](cops_sorbet.md#sorbetfalsesigil)
+* [Sorbet/ForbidComparableTEnum](cops_sorbet.md#sorbetforbidcomparabletenum)
 * [Sorbet/ForbidExtendTSigHelpersInShims](cops_sorbet.md#sorbetforbidextendtsighelpersinshims)
 * [Sorbet/ForbidIncludeConstLiteral](cops_sorbet.md#sorbetforbidincludeconstliteral)
 * [Sorbet/ForbidRBIOutsideOfAllowedPaths](cops_sorbet.md#sorbetforbidrbioutsideofallowedpaths)
@@ -29,8 +30,8 @@ In the following section you find all available cops:
 * [Sorbet/IgnoreSigil](cops_sorbet.md#sorbetignoresigil)
 * [Sorbet/ImplicitConversionMethod](cops_sorbet.md#sorbetimplicitconversionmethod)
 * [Sorbet/KeywordArgumentOrdering](cops_sorbet.md#sorbetkeywordargumentordering)
+* [Sorbet/MultipleTEnumValues](cops_sorbet.md#sorbetmultipletenumvalues)
 * [Sorbet/ObsoleteStrictMemoization](cops_sorbet.md#sorbetobsoletestrictmemoization)
-* [Sorbet/OneAncestorPerLine](cops_sorbet.md#sorbetoneancestorperline)
 * [Sorbet/RedundantExtendTSig](cops_sorbet.md#sorbetredundantextendtsig)
 * [Sorbet/SignatureBuildOrder](cops_sorbet.md#sorbetsignaturebuildorder)
 * [Sorbet/SingleLineRbiClassModuleDefinitions](cops_sorbet.md#sorbetsinglelinerbiclassmoduledefinitions)

data/manual/cops_sorbet.md

@@ -295,6 +295,33 @@ SuggestedStrictness | `false` | String
 Include | `**/*.{rb,rbi,rake,ru}` | Array
 Exclude | `bin/**/*`, `db/**/*.rb`, `script/**/*` | Array
 
+## Sorbet/ForbidComparableTEnum
+
+Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
+--- | --- | --- | --- | ---
+Enabled | Yes | No | 0.8.2 | -
+
+Disallow including the `Comparable` module in `T::Enum`.
+
+### Examples
+
+```ruby
+# bad
+class Priority < T::Enum
+  include Comparable
+
+  enums do
+    High = new(3)
+    Medium = new(2)
+    Low = new(1)
+  end
+
+  def <=>(other)
+    serialize <=> other.serialize
+  end
+end
+```
+
 ## Sorbet/ForbidExtendTSigHelpersInShims
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
@@ -639,6 +666,33 @@ sig { params(b: String, a: Integer).void }
 def foo(b:, a: 1); end
 ```
 
+## Sorbet/MultipleTEnumValues
+
+Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
+--- | --- | --- | --- | ---
+Enabled | Yes | No | 0.8.2 | -
+
+Disallow creating a `T::Enum` with less than two values.
+
+### Examples
+
+```ruby
+# bad
+class ErrorMessages < T::Enum
+  enums do
+    ServerError = new("There was a server error.")
+  end
+end
+
+# good
+class ErrorMessages < T::Enum
+  enums do
+    ServerError = new("There was a server error.")
+    NotFound = new("The resource was not found.")
+  end
+end
+```
+
 ## Sorbet/ObsoleteStrictMemoization
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
@@ -676,30 +730,6 @@ def foo
 end
 ```
 
-## Sorbet/OneAncestorPerLine
-
-Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
---- | --- | --- | --- | ---
-Disabled | Yes | Yes  | 0.6.0 | -
-
-Ensures one ancestor per requires_ancestor line
-rather than chaining them as a comma-separated list.
-
-### Examples
-
-```ruby
-# bad
-module SomeModule
-  requires_ancestor Kernel, Minitest::Assertions
-end
-
-# good
-module SomeModule
-  requires_ancestor Kernel
-  requires_ancestor Minitest::Assertions
-end
-```
-
 ## Sorbet/RedundantExtendTSig
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged

data/rubocop-sorbet.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/shopify/rubocop-sorbet"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 3.0"
+
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/shopify/rubocop-sorbet"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sorbet
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -35,6 +35,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/release.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
@@ -42,6 +43,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - CODE_OF_CONDUCT.md
@@ -55,6 +57,7 @@ files:
 - bin/rubocop
 - bin/setup
 - config/default.yml
+- config/obsoletion.yml
 - config/rbi.yml
 - dev.yml
 - lib/rubocop-sorbet.rb
@@ -71,10 +74,10 @@ files:
 - lib/rubocop/cop/sorbet/forbid_untyped_struct_props.rb
 - lib/rubocop/cop/sorbet/implicit_conversion_method.rb
 - lib/rubocop/cop/sorbet/mixin/signature_help.rb
+- lib/rubocop/cop/sorbet/mixin/t_enum.rb
 - lib/rubocop/cop/sorbet/mixin/target_sorbet_version.rb
 - lib/rubocop/cop/sorbet/mutable_constant_sorbet_aware_behaviour.rb
 - lib/rubocop/cop/sorbet/obsolete_strict_memoization.rb
-- lib/rubocop/cop/sorbet/one_ancestor_per_line.rb
 - lib/rubocop/cop/sorbet/rbi/forbid_extend_t_sig_helpers_in_shims.rb
 - lib/rubocop/cop/sorbet/rbi/forbid_rbi_outside_of_allowed_paths.rb
 - lib/rubocop/cop/sorbet/rbi/single_line_rbi_class_module_definitions.rb
@@ -95,6 +98,8 @@ files:
 - lib/rubocop/cop/sorbet/signatures/keyword_argument_ordering.rb
 - lib/rubocop/cop/sorbet/signatures/signature_build_order.rb
 - lib/rubocop/cop/sorbet/signatures/void_checked_tests.rb
+- lib/rubocop/cop/sorbet/t_enum/forbid_comparable_t_enum.rb
+- lib/rubocop/cop/sorbet/t_enum/multiple_t_enum_values.rb
 - lib/rubocop/cop/sorbet/type_alias_name.rb
 - lib/rubocop/cop/sorbet_cops.rb
 - lib/rubocop/sorbet.rb
@@ -121,14 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Automatic Sorbet code style checking tool.

data/lib/rubocop/cop/sorbet/one_ancestor_per_line.rb

@@ -1,80 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-require "rubocop"
-
-module RuboCop
-  module Cop
-    module Sorbet
-      # Ensures one ancestor per requires_ancestor line
-      # rather than chaining them as a comma-separated list.
-      #
-      # @example
-      #
-      #   # bad
-      #   module SomeModule
-      #     requires_ancestor Kernel, Minitest::Assertions
-      #   end
-      #
-      #   # good
-      #   module SomeModule
-      #     requires_ancestor Kernel
-      #     requires_ancestor Minitest::Assertions
-      #   end
-      class OneAncestorPerLine < RuboCop::Cop::Cop # rubocop:todo InternalAffairs/InheritDeprecatedCopClass
-        MSG = "Cannot require more than one ancestor per line"
-
-        # @!method requires_ancestors(node)
-        def_node_search :requires_ancestors, <<~PATTERN
-          (send nil? :requires_ancestor ...)
-        PATTERN
-
-        # @!method more_than_one_ancestor(node)
-        def_node_matcher :more_than_one_ancestor, <<~PATTERN
-          (send nil? :requires_ancestor const const+)
-        PATTERN
-
-        # @!method abstract?(node)
-        def_node_search :abstract?, <<~PATTERN
-          (send nil? :abstract!)
-        PATTERN
-
-        def on_module(node)
-          return unless node.body
-          return unless requires_ancestors(node)
-
-          process_node(node)
-        end
-
-        def on_class(node)
-          return unless abstract?(node)
-          return unless requires_ancestors(node)
-
-          process_node(node)
-        end
-
-        def autocorrect(node)
-          ->(corrector) do
-            ra_call = node.parent
-            split_ra_calls = ra_call.source.gsub(/,\s+/, new_ra_line(ra_call.loc.column))
-            corrector.replace(ra_call, split_ra_calls)
-          end
-        end
-
-        private
-
-        def process_node(node)
-          requires_ancestors(node).each do |ra|
-            add_offense(ra.child_nodes[1]) if more_than_one_ancestor(ra)
-          end
-        end
-
-        def new_ra_line(indent_count)
-          indents = " " * indent_count
-          indented_ra_call = "#{indents}requires_ancestor "
-          "\n#{indented_ra_call}"
-        end
-      end
-    end
-  end
-end