rubocop-sorbet 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bcbc5d5d2a20065dae6bd132ce89a78f6d55d913253f582d57b26dbc90e3fe
-  data.tar.gz: fc68fab55a25f15a2689564842768d87b2268ed99e8bdcf503284e47dd82deb2
+  metadata.gz: bf3fcf2d81ddb556a7a499288fefc3cdd30f4c1a6a47047ae5111ba510b51d00
+  data.tar.gz: cfeddb88f154b226f0321ed78b6373725985daf068355659763eb9913a40fbcc
 SHA512:
-  metadata.gz: 6b67f844675e5ca0c5f229cf8dd55e091f12c068dcaeb0cf289eded28a92367d32ead0f315ca4776bd0acd04e743c3c0420c345ac1ac6a7041f84dc61cc1fa78
-  data.tar.gz: ca77c4f1a29809ce05da20319309c760dff38fcf4adae09b60e4a588a24ca234a32c6a48226df8baa9eaa169b388953e4f65cb079a47d22f062924efdf3b9c3b
+  metadata.gz: 51c844a3c3dc0254a09e7c31fe3c5794873e9757c5f2ebb59f842d7ccf8786b66788d98acbac922e064395baefeb9f44df2a1f128720a9c6b5ffc56d4dabfe51
+  data.tar.gz: d42d29fbbdaa9ffd32ff3f01e56443677e439ac04444859df3fa2f87f5273a891bd6e9bfdf7f46454e604e6a5c0388c554633f39d11e3932556b7e1dd80c1ed3

data/.github/workflows/check-version-placeholders.yml

@@ -0,0 +1,16 @@
+name: Check Version Placeholders
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  check-placeholders:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Check for stale version placeholders
+        run: bundle exec rake check_version_placeholders

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
         ruby: ["3.1", "3.2", "3.3", "3.4"]
     name: Test Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Set up Ruby
         uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:
@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
     name: Lint & Docs
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Set up Ruby
         uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:

data/.github/workflows/dependabot_automerge.yml

@@ -17,7 +17,7 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
         if: ${{ steps.metadata.outputs.update-type != 'version-update:semver-major' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           script: |

data/.github/workflows/stale.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-sorbet (0.10.4)
+    rubocop-sorbet (0.11.0)
       lint_roller
       rubocop (>= 1.75.2)
 
@@ -9,12 +9,16 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
+    cgi (0.5.0)
     date (3.4.1)
-    debug (1.10.0)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.2)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.12.2)
@@ -27,19 +31,23 @@ GEM
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
     prism (1.4.0)
-    psych (5.2.2)
+    psych (5.2.6)
       date
       stringio
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
-    rdoc (6.10.0)
+    rdoc (6.14.1)
+      erb
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
-    reline (0.6.0)
+    reline (0.6.1)
       io-console (~> 0.5)
-    rubocop (1.76.1)
+    rubocop (1.77.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -47,7 +55,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.0, < 2.0)
+      rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.45.1)
@@ -61,7 +69,7 @@ GEM
       rubocop (~> 1.62)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    stringio (3.1.2)
+    stringio (3.1.7)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)

data/Rakefile

@@ -47,10 +47,6 @@ module Releaser
     version = File.read("VERSION").strip
     puts "Preparing release for version #{version}"
 
-    update_file("lib/rubocop/sorbet/version.rb") do |version_file|
-      version_file.sub(/VERSION = ".*"/, "VERSION = \"#{version}\"")
-    end
-
     update_file("config/default.yml") do |default|
       default.gsub(/['"]?<<\s*next\s*>>['"]?/i, "'#{version}'")
     end
@@ -58,7 +54,7 @@ module Releaser
     sh "bundle install"
     sh "bundle exec rake generate_cops_documentation"
 
-    sh "git add lib/rubocop/sorbet/version.rb config/default.yml Gemfile.lock VERSION manual"
+    sh "git add config/default.yml Gemfile.lock VERSION manual"
 
     sh "git commit -m 'Release v#{version}'"
     sh "git push origin main"
@@ -73,3 +69,25 @@ module Releaser
     File.write(path, yield(content))
   end
 end
+
+desc "Check for stale <<next>> placeholders when VERSION is updated"
+task :check_version_placeholders do
+  # Check if VERSION file was modified in the last commit
+  version_changed = %x(git diff HEAD~1 HEAD --name-only).split("\n").include?("VERSION")
+
+  if version_changed
+    puts "VERSION file was updated, checking for stale placeholders..."
+
+    # Check for <<next>> placeholders in config/default.yml
+    config_content = File.read("config/default.yml")
+    if config_content.match?(/['\"]?<<\s*next\s*>>['\"]?/i)
+      puts "\e[31mError: Found stale <<next>> placeholders in config/default.yml after VERSION update!\e[0m"
+      puts "\e[31mPlease run 'bundle exec rake prepare_release' to replace placeholders and commit the changes.\e[0m"
+      exit 1
+    else
+      puts "\e[32mNo stale placeholders found - all good!\e[0m"
+    end
+  else
+    puts "VERSION file was not updated in the last commit."
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.11.0

data/config/default.yml

@@ -1,7 +1,21 @@
+Sorbet/ForbidTHelpers:
+  Description: 'Forbid usage of T::Helpers via `extend` or `include`.'
+  Enabled: false
+  VersionAdded: '0.11.0'
+
+Sorbet/ForbidTSig:
+  Description: 'Forbid usage of T::Sig via `extend` or `include`.'
+  Enabled: false
+  VersionAdded: '0.11.0'
+
 inherit_mode:
   merge:
   - Exclude
 
+Sorbet:
+  DocumentationBaseURL: https://github.com/Shopify/rubocop-sorbet/blob/main/manual
+  DocumentationExtension: .md
+
 Sorbet/AllowIncompatibleOverride:
   Description: 'Disallows using `.override(allow_incompatible: true)`.'
   Enabled: true
@@ -82,7 +96,7 @@ Sorbet/EnforceSigilOrder:
 Sorbet/EnforceSignatures:
   Description: 'Ensures all methods have a valid signature.'
   Enabled: false
-  AllowRBS: false
+  Style: sig
   VersionAdded: 0.3.4
 
 Sorbet/EnforceSingleSigil:
@@ -174,32 +188,39 @@ Sorbet/ForbidTStruct:
 Sorbet/ForbidTAbsurd:
   Description: 'Forbid usage of T.absurd.'
   Enabled: false
-  VersionAdded: <<next>>
+  VersionAdded: 0.10.4
 
 Sorbet/ForbidTBind:
   Description: 'Forbid usage of T.bind.'
   Enabled: false
-  VersionAdded: <<next>>
+  VersionAdded: 0.10.4
 
 Sorbet/ForbidTCast:
   Description: 'Forbid usage of T.cast.'
   Enabled: false
-  VersionAdded: <<next>>
+  VersionAdded: 0.10.4
 
 Sorbet/ForbidTLet:
   Description: 'Forbid usage of T.let.'
   Enabled: false
-  VersionAdded: <<next>>
+  VersionAdded: 0.10.4
 
 Sorbet/ForbidTMust:
   Description: 'Forbid usage of T.must.'
   Enabled: false
-  VersionAdded: <<next>>
+  VersionAdded: 0.10.4
+
+Sorbet/ForbidTAnyWithNil:
+  Description: 'Forbid usage of T.any(NilClass).'
+  Enabled: pending
+  VersionAdded: '0.11.0'
+  Safe: true
+  SafeAutoCorrect: true
 
 Sorbet/ForbidTTypeAlias:
   Description: 'Forbid usage of T.type_alias.'
   Enabled: false
-  VersionAdded: <<next>>
+  VersionAdded: 0.10.4
 
 Sorbet/ForbidTUnsafe:
   Description: 'Forbid usage of T.unsafe.'

data/config/obsoletion.yml

@@ -6,3 +6,8 @@
 removed:
   Sorbet/OneAncestorPerLine:
     reason: '`require_ancestor` now takes a block instead of arguments'
+
+changed_parameters:
+  - cops: 'Sorbet/EnforceSignatures'
+    parameters: 'AllowRBS'
+    alternative: 'Style'

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sorbet
+      # Detect and autocorrect `T.any(..., NilClass, ...)` to `T.nilable(...)`
+      #
+      # @example
+      #
+      #   # bad
+      #   T.any(String, NilClass)
+      #   T.any(NilClass, String)
+      #   T.any(NilClass, Symbol, String)
+      #
+      #   # good
+      #   T.nilable(String)
+      #   T.nilable(String)
+      #   T.nilable(T.any(Symbol, String))
+      class ForbidTAnyWithNil < Base
+        extend AutoCorrector
+
+        MSG = "Use `T.nilable` instead of `T.any(..., NilClass, ...)`."
+        RESTRICT_ON_SEND = [:any].freeze
+
+        # @!method t_any_call?(node)
+        def_node_matcher :t_any_call?, <<~PATTERN
+          (send (const nil? :T) :any $...)
+        PATTERN
+
+        # @!method nil_const_node?(node)
+        def_node_matcher :nil_const_node?, <<~PATTERN
+          (const nil? :NilClass)
+        PATTERN
+
+        def on_send(node)
+          args = t_any_call?(node)
+          return unless args
+
+          nil_args, non_nil_args = args.partition { |a| nil_const_node?(a) }
+          return if nil_args.empty? || non_nil_args.empty?
+
+          add_offense(node) do |corrector|
+            replacement = build_replacement(non_nil_args)
+
+            corrector.replace(node, replacement)
+          end
+        end
+        alias_method :on_csend, :on_send
+
+        private
+
+        def build_replacement(non_nil_args)
+          sources = non_nil_args.map(&:source)
+          inner = sources.size == 1 ? sources.first : "T.any(#{sources.join(", ")})"
+          "T.nilable(#{inner})"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sorbet
+      # Forbids `extend T::Helpers` and `include T::Helpers` in classes and modules.
+      #
+      # This is useful when using RBS or RBS-inline syntax for type signatures,
+      # where `T::Helpers` is not needed and including it is redundant.
+      #
+      # @example
+      #
+      #   # bad
+      #   class Example
+      #     extend T::Helpers
+      #   end
+      #
+      #   # bad
+      #   module Example
+      #     include T::Helpers
+      #   end
+      #
+      #   # good
+      #   class Example
+      #   end
+      class ForbidTHelpers < RuboCop::Cop::Base
+        MSG = "Do not use `%<method>s T::Helpers`."
+        RESTRICT_ON_SEND = [:extend, :include].freeze
+
+        # @!method t_helpers?(node)
+        def_node_matcher :t_helpers?, <<~PATTERN
+          (send _ {:extend :include} (const (const {nil? | cbase} :T) :Helpers))
+        PATTERN
+
+        def on_send(node)
+          return unless t_helpers?(node)
+
+          add_offense(node, message: format(MSG, method: node.method_name))
+        end
+        alias_method :on_csend, :on_send
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sorbet
+      # Forbids `extend T::Sig` and `include T::Sig` in classes and modules.
+      #
+      # This is useful when using RBS or RBS-inline syntax for type signatures,
+      # where `T::Sig` is not needed and including it is redundant.
+      #
+      # @example
+      #
+      #   # bad
+      #   class Example
+      #     extend T::Sig
+      #   end
+      #
+      #   # bad
+      #   module Example
+      #     include T::Sig
+      #   end
+      #
+      #   # good
+      #   class Example
+      #   end
+      class ForbidTSig < RuboCop::Cop::Base
+        MSG = "Do not use `%<method>s T::Sig`."
+        RESTRICT_ON_SEND = [:extend, :include].freeze
+
+        # @!method t_sig?(node)
+        def_node_matcher :t_sig?, <<~PATTERN
+          (send _ {:extend :include} (const (const {nil? | cbase} :T) :Sig))
+        PATTERN
+
+        def on_send(node)
+          return unless t_sig?(node)
+
+          add_offense(node, message: format(MSG, method: node.method_name))
+        end
+        alias_method :on_csend, :on_send
+      end
+    end
+  end
+end

data/lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "stringio"
-
 module RuboCop
   module Cop
     module Sorbet
@@ -24,16 +22,12 @@ module RuboCop
       #
       # * `ParameterTypePlaceholder`: placeholders used for parameter types (default: 'T.untyped')
       # * `ReturnTypePlaceholder`: placeholders used for return types (default: 'T.untyped')
+      # * `Style`: signature style to enforce - 'sig' for sig blocks, 'rbs' for RBS comments, 'both' to allow either (default: 'sig')
       class EnforceSignatures < ::RuboCop::Cop::Base
         extend AutoCorrector
         include SignatureHelp
 
-        RBS_COMMENT_REGEX = /^#:.*$/
-
-        def initialize(config = nil, options = nil)
-          super(config, options)
-          @last_sig_for_scope = {}
-        end
+        VALID_STYLES = ["sig", "rbs", "both"].freeze
 
         # @!method accessor?(node)
         def_node_matcher(:accessor?, <<-PATTERN)
@@ -53,7 +47,13 @@ module RuboCop
         end
 
         def on_signature(node)
-          @last_sig_for_scope[scope(node)] = node
+          sig_checker.on_signature(node, scope(node))
+        end
+
+        def on_new_investigation
+          super
+          @sig_checker = nil
+          @rbs_checker = nil
         end
 
         def scope(node)
@@ -67,48 +67,102 @@ module RuboCop
 
         def check_node(node)
           scope = self.scope(node)
-          unless @last_sig_for_scope[scope] || has_rbs_comment?(node)
-            add_offense(
-              node,
-              message: "Each method is required to have a signature.",
-            ) do |corrector|
-              autocorrect(corrector, node)
+          sig_node = sig_checker.signature_node(scope)
+          rbs_node = rbs_checker.signature_node(node)
+
+          case signature_style
+          when "rbs"
+            # RBS style - only RBS signatures allowed
+            if sig_node
+              add_offense(sig_node, message: "Use RBS signature comments rather than sig blocks.")
+              return
+            end
+
+            unless rbs_node
+              add_offense(node, message: "Each method is required to have an RBS signature.") do |corrector|
+                autocorrect_with_signature_type(corrector, node, "rbs")
+              end
+            end
+          when "both"
+            # Both styles allowed - require at least one
+            unless sig_node || rbs_node
+              add_offense(node, message: "Each method is required to have a signature.") do |corrector|
+                autocorrect_with_signature_type(corrector, node, "sig")
+              end
+            end
+          else # "sig" (default)
+            # Sig style - only sig signatures allowed
+            unless sig_node
+              add_offense(node, message: "Each method is required to have a sig block signature.") do |corrector|
+                autocorrect_with_signature_type(corrector, node, "sig")
+              end
             end
           end
-          @last_sig_for_scope[scope] = nil
+        ensure
+          sig_checker.clear_signature(scope)
         end
 
-        def has_rbs_comment?(node)
-          return false unless cop_config["AllowRBS"] == true
-
-          node = node.parent while RuboCop::AST::SendNode === node.parent
-          return false if (comments = preceeding_comments(node)).empty?
+        def sig_checker
+          @sig_checker ||= SigSignatureChecker.new(processed_source)
+        end
 
-          last_comment = comments.last
-          return false if last_comment.loc.line + 1 < node.loc.line
+        def rbs_checker
+          @rbs_checker ||= RBSSignatureChecker.new(processed_source)
+        end
 
-          comments.any? { |comment| RBS_COMMENT_REGEX.match?(comment.text) }
+        def autocorrect_with_signature_type(corrector, node, type)
+          suggest = create_signature_suggestion(node, type)
+          populate_signature_suggestion(suggest, node)
+          corrector.insert_before(node, suggest.to_autocorrect)
         end
 
-        def preceeding_comments(node)
-          processed_source.ast_with_comments[node].select { |comment| comment.loc.line < node.loc.line }
+        def create_signature_suggestion(node, type)
+          case type
+          when "rbs"
+            RBSSuggestion.new(node.loc.column)
+          else # "sig"
+            SigSuggestion.new(node.loc.column, param_type_placeholder, return_type_placeholder)
+          end
         end
 
-        def autocorrect(corrector, node)
-          suggest = SigSuggestion.new(node.loc.column, param_type_placeholder, return_type_placeholder)
+        def populate_signature_suggestion(suggest, node)
+          if node.any_def_type?
+            populate_method_definition_suggestion(suggest, node)
+          elsif accessor?(node)
+            populate_accessor_suggestion(suggest, node)
+          end
+        end
 
-          if node.is_a?(RuboCop::AST::DefNode) # def something
-            node.arguments.each do |arg|
+        def populate_method_definition_suggestion(suggest, node)
+          node.arguments.each do |arg|
+            if arg.blockarg_type? && suggest.respond_to?(:has_block=)
+              suggest.has_block = true
+            else
               suggest.params << arg.children.first
             end
-          elsif accessor?(node) # attr reader, writer, accessor
-            method = node.children[1]
-            symbol = node.children[2]
-            suggest.params << symbol.value if symbol && (method == :attr_writer || method == :attr_accessor)
-            suggest.returns = "void" if method == :attr_writer
           end
+        end
 
-          corrector.insert_before(node, suggest.to_autocorrect)
+        def populate_accessor_suggestion(suggest, node)
+          method = node.children[1]
+          symbol = node.children[2]
+
+          add_accessor_parameter_if_needed(suggest, symbol, method)
+          set_void_return_for_writer(suggest, method)
+        end
+
+        def add_accessor_parameter_if_needed(suggest, symbol, method)
+          return unless symbol && writer_or_accessor?(method)
+
+          suggest.params << symbol.value
+        end
+
+        def set_void_return_for_writer(suggest, method)
+          suggest.returns = "void" if method == :attr_writer
+        end
+
+        def writer_or_accessor?(method)
+          method == :attr_writer || method == :attr_accessor
         end
 
         def param_type_placeholder
@@ -119,6 +173,80 @@ module RuboCop
           cop_config["ReturnTypePlaceholder"] || "T.untyped"
         end
 
+        def allow_rbs?
+          cop_config["AllowRBS"] == true
+        end
+
+        def signature_style
+          config_value = cop_config["Style"]
+          if config_value
+            unless VALID_STYLES.include?(config_value)
+              raise ArgumentError, "Invalid Style option: '#{config_value}'. Valid options are: #{VALID_STYLES.join(", ")}"
+            end
+
+            return config_value
+          end
+
+          return "both" if allow_rbs?
+
+          "sig"
+        end
+
+        class SignatureChecker
+          def initialize(processed_source)
+            @processed_source = processed_source
+          end
+
+          protected
+
+          attr_reader :processed_source
+
+          def preceding_comments(node)
+            processed_source.ast_with_comments[node].select { |comment| comment.loc.line < node.loc.line }
+          end
+        end
+
+        class RBSSignatureChecker < SignatureChecker
+          RBS_COMMENT_REGEX = /^#\s*:.*$/
+
+          def signature_node(node)
+            node = find_non_send_ancestor(node)
+            comments = preceding_comments(node)
+            return if comments.empty?
+
+            last_comment = comments.last
+            return if last_comment.loc.line + 1 < node.loc.line
+
+            comments.find { |comment| RBS_COMMENT_REGEX.match?(comment.text) }
+          end
+
+          private
+
+          def find_non_send_ancestor(node)
+            node = node.parent while node.parent&.send_type?
+            node
+          end
+        end
+
+        class SigSignatureChecker < SignatureChecker
+          def initialize(processed_source)
+            super(processed_source)
+            @last_sig_for_scope = {}
+          end
+
+          def signature_node(scope)
+            @last_sig_for_scope[scope]
+          end
+
+          def on_signature(node, scope)
+            @last_sig_for_scope[scope] = node
+          end
+
+          def clear_signature(scope)
+            @last_sig_for_scope[scope] = nil
+          end
+        end
+
         class SigSuggestion
           attr_accessor :params, :returns
 
@@ -131,34 +259,59 @@ module RuboCop
           end
 
           def to_autocorrect
-            out = StringIO.new
-            out << "sig { "
-            out << generate_params
-            out << generate_return
-            out << " }\n"
-            out << " " * @indent # preserve indent for the next line
-            out.string
+            "sig { #{generate_params}#{generate_return} }\n#{" " * @indent}"
           end
 
           private
 
           def generate_params
-            return if @params.empty?
+            return "" if @params.empty?
 
-            out = StringIO.new
-            out << "params("
-            out << @params.map do |param|
-              "#{param}: #{@param_placeholder}"
-            end.join(", ")
-            out << ")."
-            out.string
+            param_list = @params.map { |param| "#{param}: #{@param_placeholder}" }.join(", ")
+            "params(#{param_list})."
           end
 
           def generate_return
-            return "returns(#{@return_placeholder})" if @returns.nil?
-            return @returns if @returns == "void"
+            if @returns.nil?
+              "returns(#{@return_placeholder})"
+            elsif @returns == "void"
+              "void"
+            else
+              "returns(#{@returns})"
+            end
+          end
+        end
+
+        class RBSSuggestion
+          attr_accessor :params, :returns, :has_block
+
+          def initialize(indent)
+            @params = []
+            @returns = nil
+            @has_block = false
+            @indent = indent
+          end
+
+          def to_autocorrect
+            "#: #{generate_signature}\n#{" " * @indent}"
+          end
+
+          private
+
+          def generate_signature
+            param_types = @params.map { "untyped" }.join(", ")
+            return_type = @returns || "untyped"
+
+            signature = if @params.empty?
+              "()"
+            else
+              "(#{param_types})"
+            end
+
+            signature += " { (?) -> untyped }" if @has_block
+            signature += " -> #{return_type}"
 
-            "returns(#{@returns})"
+            signature
           end
         end
       end

data/lib/rubocop/cop/sorbet_cops.rb

@@ -10,6 +10,7 @@ require_relative "sorbet/constants_from_strings"
 require_relative "sorbet/forbid_superclass_const_literal"
 require_relative "sorbet/forbid_include_const_literal"
 require_relative "sorbet/forbid_mixes_in_class_methods"
+require_relative "sorbet/forbid_t_any_with_nil"
 require_relative "sorbet/forbid_type_aliased_shapes"
 require_relative "sorbet/forbid_untyped_struct_props"
 require_relative "sorbet/implicit_conversion_method"
@@ -18,8 +19,10 @@ require_relative "sorbet/forbid_t_absurd"
 require_relative "sorbet/forbid_t_bind"
 require_relative "sorbet/forbid_t_cast"
 require_relative "sorbet/forbid_t_enum"
+require_relative "sorbet/forbid_t_helpers"
 require_relative "sorbet/forbid_t_let"
 require_relative "sorbet/forbid_t_must"
+require_relative "sorbet/forbid_t_sig"
 require_relative "sorbet/forbid_t_struct"
 require_relative "sorbet/forbid_t_type_alias"
 require_relative "sorbet/forbid_t_unsafe"

data/lib/rubocop/sorbet/plugin.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-rubocop_min_version = Gem::Version.create("1.72.1")
-rubocop_version = Gem::Version.create(RuboCop::Version.version)
-
-return if rubocop_version < rubocop_min_version
-
 require "rubocop"
 require "lint_roller"
 require "pathname"

data/lib/rubocop/sorbet/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Sorbet
-    VERSION = "0.10.4"
+    VERSION = File.read(File.expand_path("../../../VERSION", __dir__)).strip
   end
 end

data/lib/rubocop-sorbet.rb

@@ -6,9 +6,4 @@ require_relative "rubocop/sorbet"
 require_relative "rubocop/sorbet/version"
 require_relative "rubocop/sorbet/plugin"
 
-unless defined?(RuboCop::Sorbet::Plugin)
-  require_relative "rubocop/sorbet/inject"
-  RuboCop::Sorbet::Inject.defaults!
-end
-
 require_relative "rubocop/cop/sorbet_cops"

data/manual/cops.md

@@ -28,11 +28,14 @@ In the following section you find all available cops:
 * [Sorbet/ForbidSigWithoutRuntime](cops_sorbet.md#sorbetforbidsigwithoutruntime)
 * [Sorbet/ForbidSuperclassConstLiteral](cops_sorbet.md#sorbetforbidsuperclassconstliteral)
 * [Sorbet/ForbidTAbsurd](cops_sorbet.md#sorbetforbidtabsurd)
+* [Sorbet/ForbidTAnyWithNil](cops_sorbet.md#sorbetforbidtanywithnil)
 * [Sorbet/ForbidTBind](cops_sorbet.md#sorbetforbidtbind)
 * [Sorbet/ForbidTCast](cops_sorbet.md#sorbetforbidtcast)
 * [Sorbet/ForbidTEnum](cops_sorbet.md#sorbetforbidtenum)
+* [Sorbet/ForbidTHelpers](cops_sorbet.md#sorbetforbidthelpers)
 * [Sorbet/ForbidTLet](cops_sorbet.md#sorbetforbidtlet)
 * [Sorbet/ForbidTMust](cops_sorbet.md#sorbetforbidtmust)
+* [Sorbet/ForbidTSig](cops_sorbet.md#sorbetforbidtsig)
 * [Sorbet/ForbidTStruct](cops_sorbet.md#sorbetforbidtstruct)
 * [Sorbet/ForbidTTypeAlias](cops_sorbet.md#sorbetforbidttypealias)
 * [Sorbet/ForbidTUnsafe](cops_sorbet.md#sorbetforbidtunsafe)

data/manual/cops_sorbet.md

@@ -331,12 +331,13 @@ You can configure the placeholders used by changing the following options:
 
 * `ParameterTypePlaceholder`: placeholders used for parameter types (default: 'T.untyped')
 * `ReturnTypePlaceholder`: placeholders used for return types (default: 'T.untyped')
+* `Style`: signature style to enforce - 'sig' for sig blocks, 'rbs' for RBS comments, 'both' to allow either (default: 'sig')
 
 ### Configurable attributes
 
 Name | Default value | Configurable values
 --- | --- | ---
-AllowRBS | `false` | Boolean
+Style | `sig` | String
 
 ## Sorbet/EnforceSingleSigil
 
@@ -636,7 +637,7 @@ Exclude | `db/migrate/*.rb` | Array
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | No | <<next>> | -
+Disabled | Yes | No | 0.10.4 | -
 
 Disallows using `T.absurd` anywhere.
 
@@ -650,11 +651,33 @@ T.absurd(foo)
 x #: absurd
 ```
 
+## Sorbet/ForbidTAnyWithNil
+
+Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
+--- | --- | --- | --- | ---
+Enabled | Yes | Yes  | 0.11.0 | -
+
+Detect and autocorrect `T.any(..., NilClass, ...)` to `T.nilable(...)`
+
+### Examples
+
+```ruby
+# bad
+T.any(String, NilClass)
+T.any(NilClass, String)
+T.any(NilClass, Symbol, String)
+
+# good
+T.nilable(String)
+T.nilable(String)
+T.nilable(T.any(Symbol, String))
+```
+
 ## Sorbet/ForbidTBind
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | No | <<next>> | -
+Disabled | Yes | No | 0.10.4 | -
 
 Disallows using `T.bind` anywhere.
 
@@ -672,7 +695,7 @@ T.bind(self, Integer)
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | No | <<next>> | -
+Disabled | Yes | No | 0.10.4 | -
 
 Disallows using `T.cast` anywhere.
 
@@ -713,11 +736,40 @@ class MyEnum
 end
 ```
 
+## Sorbet/ForbidTHelpers
+
+Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
+--- | --- | --- | --- | ---
+Disabled | Yes | No | 0.11.0 | -
+
+Forbids `extend T::Helpers` and `include T::Helpers` in classes and modules.
+
+This is useful when using RBS or RBS-inline syntax for type signatures,
+where `T::Helpers` is not needed and including it is redundant.
+
+### Examples
+
+```ruby
+# bad
+class Example
+  extend T::Helpers
+end
+
+# bad
+module Example
+  include T::Helpers
+end
+
+# good
+class Example
+end
+```
+
 ## Sorbet/ForbidTLet
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | No | <<next>> | -
+Disabled | Yes | No | 0.10.4 | -
 
 Disallows using `T.let` anywhere.
 
@@ -735,7 +787,7 @@ foo #: Integer
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | No | <<next>> | -
+Disabled | Yes | No | 0.10.4 | -
 
 Disallows using `T.must` anywhere.
 
@@ -749,6 +801,35 @@ T.must(foo)
 foo #: as !nil
 ```
 
+## Sorbet/ForbidTSig
+
+Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
+--- | --- | --- | --- | ---
+Disabled | Yes | No | 0.11.0 | -
+
+Forbids `extend T::Sig` and `include T::Sig` in classes and modules.
+
+This is useful when using RBS or RBS-inline syntax for type signatures,
+where `T::Sig` is not needed and including it is redundant.
+
+### Examples
+
+```ruby
+# bad
+class Example
+  extend T::Sig
+end
+
+# bad
+module Example
+  include T::Sig
+end
+
+# good
+class Example
+end
+```
+
 ## Sorbet/ForbidTStruct
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
@@ -792,7 +873,7 @@ end
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | No | <<next>> | -
+Disabled | Yes | No | 0.10.4 | -
 
 Disallows using `T.type_alias` anywhere.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sorbet
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -50,6 +50,7 @@ files:
 - ".github/CODEOWNERS"
 - ".github/dependabot.yml"
 - ".github/release.yml"
+- ".github/workflows/check-version-placeholders.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
 - ".github/workflows/dependabot_automerge.yml"
@@ -85,11 +86,14 @@ files:
 - lib/rubocop/cop/sorbet/forbid_mixes_in_class_methods.rb
 - lib/rubocop/cop/sorbet/forbid_superclass_const_literal.rb
 - lib/rubocop/cop/sorbet/forbid_t_absurd.rb
+- lib/rubocop/cop/sorbet/forbid_t_any_with_nil.rb
 - lib/rubocop/cop/sorbet/forbid_t_bind.rb
 - lib/rubocop/cop/sorbet/forbid_t_cast.rb
 - lib/rubocop/cop/sorbet/forbid_t_enum.rb
+- lib/rubocop/cop/sorbet/forbid_t_helpers.rb
 - lib/rubocop/cop/sorbet/forbid_t_let.rb
 - lib/rubocop/cop/sorbet/forbid_t_must.rb
+- lib/rubocop/cop/sorbet/forbid_t_sig.rb
 - lib/rubocop/cop/sorbet/forbid_t_struct.rb
 - lib/rubocop/cop/sorbet/forbid_t_type_alias.rb
 - lib/rubocop/cop/sorbet/forbid_t_unsafe.rb
@@ -135,7 +139,6 @@ files:
 - lib/rubocop/cop/sorbet/type_alias_name.rb
 - lib/rubocop/cop/sorbet_cops.rb
 - lib/rubocop/sorbet.rb
-- lib/rubocop/sorbet/inject.rb
 - lib/rubocop/sorbet/plugin.rb
 - lib/rubocop/sorbet/version.rb
 - manual/cops.md
@@ -166,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Automatic Sorbet code style checking tool.
 test_files: []

data/lib/rubocop/sorbet/inject.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-# The original code is from https://github.com/rubocop-hq/rubocop-rspec/blob/master/lib/rubocop/rspec/inject.rb
-# See https://github.com/rubocop-hq/rubocop-rspec/blob/master/MIT-LICENSE.md
-module RuboCop
-  module Sorbet
-    # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
-    # bit of our configuration.
-    module Inject
-      class << self
-        def defaults!
-          path = CONFIG_DEFAULT.to_s
-          hash = ConfigLoader.send(:load_yaml_configuration, path)
-          if Gem::Version.new(RuboCop::Version::STRING) >= Gem::Version.new("1.66")
-            # We use markdown for cop documentation. Unconditionally setting
-            # the base url will produce incorrect urls on older RuboCop versions,
-            # so we do that for fully supported version only here.
-            hash["Sorbet"] ||= {}
-            hash["Sorbet"]["DocumentationBaseURL"] = "https://github.com/Shopify/rubocop-sorbet/blob/main/manual"
-            hash["Sorbet"]["DocumentationExtension"] = ".md"
-          end
-          config = Config.new(hash, path).tap(&:make_excludes_absolute)
-          puts "configuration from #{path}" if ConfigLoader.debug?
-          config = ConfigLoader.merge_with_default(config, path)
-          ConfigLoader.instance_variable_set(:@default_configuration, config)
-        end
-      end
-    end
-  end
-end