rubocop-sorbet 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c39dd9a109166794a04d1de593be112325fa55f600df1d6fc1d481c400360a2a
-  data.tar.gz: '079324e7c60ee05df867f0906e7793834f617c52976dae43eb1abc73a64e1abb'
+  metadata.gz: 470327d8286422c40aae8ee749d18b5eb41dc672e1a7a9840ad5127c5b9b908d
+  data.tar.gz: 74920f83bc657a9bf96be7f917479d945e3ff26f8a0ee084c34bb82e2b89da31
 SHA512:
-  metadata.gz: 9437cce4926a57337187fc4b2a493f06d2689e84dff0dc4fe812bbf24fe5dab0d85aa3a677f3d114a8f258fa90a84fcea6dd2eae57200675853800c1df4028a0
-  data.tar.gz: 35305c1ad2adaf35bafd5cc05dfda479e24098ef20ee6512dcb39709b8fe1a6525e85aa436cb35e23e5aa089146c2ffd74182f6edf7e9706e3bea7173220cb8c
+  metadata.gz: 30ff526689054a6f85efa7db803f707f1409e7490b930b497c5c352a5b729701090100a2143228bca9e8b6023240d162541e974bf0e7e5e58c7a1dbe8b16dbd6
+  data.tar.gz: 589c8d1fda81972ae50ab72138e952c9d17d4dc7275dee9ef58473af9a013f671f5f8c71a8e423fbd977d247e1fa41a7bf266a517a532ab32826f60ad406a5ba

data/.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
           bundler-cache: true
 
       - name: Release gem on RubyGems.org
-        uses: rubygems/release-gem@052cc82692552de3ef2b81fd670e41d13cba8092 # v1.4.0
+        uses: rubygems/release-gem@7f9650160c1a4e7989fdc9855807bdbd421d8b6b # v1.4.1
 
   release_github:
     name: Create GitHub release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-sorbet (0.15.0)
+    rubocop-sorbet (0.16.0)
       lint_roller
       rbi (~> 0.4)
       rubocop (>= 1.75.2)
@@ -110,6 +110,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  arm64-darwin-24
   arm64-darwin-25
   x86_64-linux
 

data/VERSION

@@ -1 +1 @@
-0.15.0
+0.16.0

data/config/default.yml

@@ -5,6 +5,9 @@
 Layout/LeadingCommentSpace:
   AllowRBSInlineAnnotation: true
 
+Lint/SelfAssignment:
+  AllowRBSInlineAnnotation: true
+
 Sorbet/ForbidTHelpers:
   Description: 'Forbid usage of T::Helpers via `extend` or `include`.'
   Enabled: false
@@ -246,7 +249,7 @@ Sorbet/ForbidTCast:
   AutocorrectToRBS: false
   SafeAutoCorrect: false
   VersionAdded: 0.10.4
-  VersionChanged: '0.15.0'
+  VersionChanged: '0.16.0'
 
 Sorbet/ForbidTLet:
   Description: 'Forbid usage of T.let.'
@@ -254,7 +257,7 @@ Sorbet/ForbidTLet:
   AutocorrectToRBS: false
   SafeAutoCorrect: false
   VersionAdded: 0.10.4
-  VersionChanged: '0.15.0'
+  VersionChanged: '0.16.0'
 
 Sorbet/ForbidTMust:
   Description: 'Forbid usage of T.must.'
@@ -282,7 +285,7 @@ Sorbet/ForbidTUnsafe:
   AutocorrectToRBS: false
   SafeAutoCorrect: false
   VersionAdded: 0.7.0
-  VersionChanged: '0.15.0'
+  VersionChanged: '0.16.0'
 
 Sorbet/ForbidTUntyped:
   Description: 'Forbid usage of T.untyped'

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

@@ -37,10 +37,11 @@ module RuboCop
 
         def autocorrect_t_cast_to_rbs(corrector, node)
           return if t_cast?(node.first_argument)
-          return unless rbs_assertion_autocorrectable?(node, allow_assignment: true)
 
-          type = ::RBI::Type.parse_string(node.last_argument.source).rbs_string
-          corrector.replace(node, "#{node.first_argument.source} #: as #{type}")
+          autocorrect_rbs_assertion(corrector, node, allow_assignment: true) do
+            type = ::RBI::Type.parse_string(node.last_argument.source).rbs_string
+            [node.first_argument.source, "as #{type}"]
+          end
         rescue ::RBI::Type::Error
           nil
         end

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

@@ -37,10 +37,11 @@ module RuboCop
 
         def autocorrect_t_let_to_rbs(corrector, node)
           return if t_let?(node.first_argument)
-          return unless rbs_assertion_autocorrectable?(node, allow_assignment: true)
 
-          type = ::RBI::Type.parse_string(node.last_argument.source).rbs_string
-          corrector.replace(node, "#{node.first_argument.source} #: #{type}")
+          autocorrect_rbs_assertion(corrector, node, allow_assignment: true) do
+            type = ::RBI::Type.parse_string(node.last_argument.source).rbs_string
+            [node.first_argument.source, type]
+          end
         rescue ::RBI::Type::Error
           nil
         end

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

@@ -35,9 +35,9 @@ module RuboCop
         private
 
         def autocorrect_t_unsafe_to_rbs(corrector, node)
-          return unless rbs_assertion_autocorrectable?(node, allow_assignment: true)
-
-          corrector.replace(node, "#{node.first_argument.source} #: as untyped")
+          autocorrect_rbs_assertion(corrector, node, allow_assignment: true) do
+            [node.first_argument.source, "as untyped"]
+          end
         end
       end
     end

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

@@ -3,16 +3,133 @@
 module RuboCop
   module Cop
     module Sorbet
-      # Shared guards for replacing Sorbet runtime assertions with RBS inline
-      # comments without changing the surrounding Ruby syntax.
+      # Shared guards and rewrites for replacing Sorbet runtime assertions
+      # with equivalent RBS inline comments.
       module RBSAssertionCorrection
         include RangeHelp
+        include Alignment
 
         COMMENT_START = "#"
         NEWLINES = ["\n", "\r"].freeze
 
         private
 
+        def autocorrect_rbs_assertion(corrector, node, allow_assignment: false)
+          context = rbs_assertion_correction_context(node, allow_assignment: allow_assignment)
+          return unless context
+
+          expression, annotation = yield
+          case context.first
+          when :direct
+            corrector.replace(node, "#{expression} #: #{annotation}")
+          when :arguments
+            autocorrect_argument_list(corrector, node, expression, annotation, context)
+          end
+        end
+
+        def rbs_assertion_correction_context(node, allow_assignment:)
+          return [:direct] if rbs_assertion_autocorrectable?(node, allow_assignment: allow_assignment)
+          return unless nested_rbs_assertion_autocorrectable?(node)
+
+          call_argument_context(node)
+        end
+
+        def call_argument_context(node)
+          parent = node.parent
+          if parent&.type?(:call) && parent.arguments.include?(node)
+            call = parent
+            target = node
+          elsif parent&.splat_type?
+            call = parent.parent
+            return unless call&.type?(:call) && call.arguments.include?(parent)
+
+            target = parent
+          elsif parent&.kwsplat_type?
+            argument = node.first_argument
+            return if argument.hash_type? && !argument.loc.begin
+
+            hash = parent.parent
+            return unless hash&.hash_type? && !hash.loc.begin
+
+            call = hash.parent
+            return unless call&.type?(:call) && call.arguments.include?(hash)
+
+            target = parent
+          elsif parent&.pair_type? && parent.value.equal?(node)
+            hash = parent.parent
+            return unless hash&.hash_type? && !hash.loc.begin
+
+            call = hash.parent
+            return unless call&.type?(:call) && call.arguments.include?(hash)
+
+            target = parent
+          else
+            return
+          end
+
+          return unless call.single_line? && call.loc.begin && call.loc.end
+          return if comments_within?(call)
+          return unless one_matching_assertion?(call, node)
+
+          items = call.arguments.flat_map do |argument|
+            argument.hash_type? && !argument.loc.begin ? argument.children : argument
+          end
+          return unless items.include?(target)
+
+          [:arguments, call, items, target]
+        end
+
+        def autocorrect_argument_list(corrector, node, expression, annotation, context)
+          _, container, items, target = context
+          indentation = container.source_range.source_line[/\A[ \t]*/]
+          item_indentation = indentation + (" " * configured_indentation_width)
+          splat = target.type?(:splat, :kwsplat)
+          target_index = items.index(target)
+          replacement = "#{expression} #: #{annotation}"
+          if splat
+            nested_indentation = item_indentation + (" " * configured_indentation_width)
+            replacement = "(\n#{nested_indentation}#{replacement}\n#{item_indentation})"
+          elsif target_index < items.length - 1
+            replacement = "#{expression}, #: #{annotation}"
+          end
+          corrector.replace(node, replacement)
+
+          corrector.replace(container.loc.begin.end.join(items.first.source_range.begin), "\n#{item_indentation}")
+          items.each_cons(2) do |item, next_item|
+            separator = item.equal?(target) && !splat ? "" : ","
+            corrector.replace(item.source_range.end.join(next_item.source_range.begin), "#{separator}\n#{item_indentation}")
+          end
+          corrector.replace(items.last.source_range.end.join(container.loc.end.begin), "\n#{indentation}")
+        end
+
+        def comments_within?(node)
+          range = node.source_range
+          processed_source.comments.any? do |comment|
+            comment.source_range.begin_pos >= range.begin_pos && comment.source_range.end_pos <= range.end_pos
+          end
+        end
+
+        def one_matching_assertion?(container, node)
+          container.each_node(:send).count do |candidate|
+            candidate.method?(node.method_name) &&
+              candidate.receiver&.const_type? &&
+              candidate.receiver.const_name == "T"
+          end == 1
+        end
+
+        def nested_rbs_assertion_autocorrectable?(node)
+          return false unless cop_config["AutocorrectToRBS"]
+          return false unless node.single_line?
+          return false if inside_single_line_block?(node)
+          return false if ::RuboCop::Sorbet::RBSParser.rbs_annotation_after(processed_source, node)
+
+          true
+        end
+
+        def inside_single_line_block?(node)
+          node.each_ancestor.any? { |ancestor| ancestor.type?(:block, :numblock) && ancestor.single_line? }
+        end
+
         def rbs_assertion_autocorrectable?(node, allow_assignment: false)
           return false unless cop_config["AutocorrectToRBS"]
           return false unless assertion_ends_line?(node)

data/manual/cops_sorbet.md

@@ -733,7 +733,7 @@ foo = T.cast(self, Integer)
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | Yes (Unsafe) | 0.10.4 | 0.15.0
+Disabled | Yes | Yes (Unsafe) | 0.10.4 | 0.16.0
 
 Disallows using `T.cast` anywhere.
 Set `AutocorrectToRBS: true` to replace supported calls with RBS inline comments.
@@ -814,7 +814,7 @@ end
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | Yes (Unsafe) | 0.10.4 | 0.15.0
+Disabled | Yes | Yes (Unsafe) | 0.10.4 | 0.16.0
 
 Disallows using `T.let` anywhere.
 Set `AutocorrectToRBS: true` to replace supported calls with RBS inline comments.
@@ -980,7 +980,7 @@ STRING_OR_INTEGER = T.type_alias { T.any(Integer, String) }
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Disabled | Yes | Yes (Unsafe) | 0.7.0 | 0.15.0
+Disabled | Yes | Yes (Unsafe) | 0.7.0 | 0.16.0
 
 Disallows using `T.unsafe` anywhere.
 Set `AutocorrectToRBS: true` to replace supported calls with RBS inline comments.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sorbet
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu