Merge branch 'main' into deadcode-fix-heredoc-over-removal

Author: KaanOzkan

Gemfile.lock

@@ -29,7 +29,7 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.21.1)
+    json (2.21.2)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -57,10 +57,10 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rbi (0.4.2)
+    rbi (0.4.3)
       prism (~> 1.0)
       rbs (>= 4.0.1)
-    rbs (4.1.1)
+    rbs (4.1.3)
       logger
       prism (>= 1.6.0)
       tsort
@@ -73,7 +73,7 @@ GEM
       io-console (~> 0.5)
     require-hooks (0.4.0)
     rexml (3.4.4)
-    rubocop (1.88.2)
+    rubocop (1.89.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -91,24 +91,24 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-shopify (3.0.1)
+    rubocop-shopify (3.0.2)
       lint_roller
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-sorbet (0.13.2)
+    rubocop-sorbet (0.14.0)
       lint_roller
       rubocop (>= 1.75.2)
     ruby-progressbar (1.13.0)
     rubydex (0.2.6-arm64-darwin)
     rubydex (0.2.6-x86_64-darwin)
     rubydex (0.2.6-x86_64-linux)
-    sorbet (0.6.13386)
-      sorbet-static (= 0.6.13386)
-    sorbet-runtime (0.6.13386)
-    sorbet-static (0.6.13386-universal-darwin)
-    sorbet-static (0.6.13386-x86_64-linux)
-    sorbet-static-and-runtime (0.6.13386)
-      sorbet (= 0.6.13386)
-      sorbet-runtime (= 0.6.13386)
+    sorbet (0.6.13414)
+      sorbet-static (= 0.6.13414)
+    sorbet-runtime (0.6.13414)
+    sorbet-static (0.6.13414-universal-darwin)
+    sorbet-static (0.6.13414-x86_64-linux)
+    sorbet-static-and-runtime (0.6.13414)
+      sorbet (= 0.6.13414)
+      sorbet-runtime (= 0.6.13414)
     stringio (3.2.0)
     tapioca (0.19.2)
       benchmark

lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb

@@ -231,12 +231,10 @@ def apply_class_annotations(node)
               node.expression.location.end_offset
             end
 
-            # Only translate (and `extend T::Helpers`) when there's at least one *known* class
+            # Only translate (and `extend ::T::Helpers`) when there's at least one *known* class
             # annotation. A node with only unknown annotations (e.g. `@private`) is left untouched.
             if comments.class_annotations.any?
-              unless already_extends?(node, /^(::)?T::Helpers$/)
-                extend_with("T::Helpers", into: node, at: insert_pos)
-              end
+              extend_with("::T::Helpers", into: node, at: insert_pos)
 
               comments.annotations.reverse_each do |annotation|
                 content = case annotation.string
@@ -286,9 +284,7 @@ def apply_class_annotations(node)
                   next
                 end
 
-                unless already_extends?(node, /^(::)?T::Generic$/)
-                  extend_with("T::Generic", into: node, at: insert_pos)
-                end
+                extend_with("::T::Generic", into: node, at: insert_pos)
 
                 type_params.each do |type_param|
                   type_member = "#{type_param.name} = type_member"
@@ -395,22 +391,6 @@ def rewrite_annotation(annotation, is_known:) = nil # no-op
           #: (String mixin_name, into: PrismTypes::anyScopeNode, at: Integer) -> void
           def extend_with(mixin_name, into:, at:) = raise
 
-          #: (PrismTypes::anyScopeNode, Regexp) -> bool
-          def already_extends?(node, constant_regex)
-            node.child_nodes.any? do |c|
-              next false unless c.is_a?(Prism::CallNode)
-              next false unless c.message == "extend"
-              next false unless c.receiver.nil? || c.receiver.is_a?(Prism::SelfNode)
-              next false unless c.arguments&.arguments&.size == 1
-
-              arg = c.arguments&.arguments&.first
-              next false unless arg.is_a?(Prism::ConstantPathNode)
-              next false unless arg.slice.match?(constant_regex)
-
-              true
-            end
-          end
-
           #: (Array[Prism::Comment]) -> Array[Spoom::RBS::TypeAlias]
           def collect_type_aliases(comments)
             type_aliases = [] #: Array[Spoom::RBS::TypeAlias]

rbi/spoom.rbi

@@ -3375,14 +3375,6 @@ class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseTranslator < ::Spoo
 
   private
 
-  sig do
-    params(
-      node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
-      constant_regex: ::Regexp
-    ).returns(T::Boolean)
-  end
-  def already_extends?(node, constant_regex); end
-
   sig do
     abstract
       .params(

test/spoom/cli/srb/lsp_test.rb

@@ -83,6 +83,7 @@ class HoverTest; end
           result = @project.spoom("srb lsp --no-color hover lib/hover.rb 2 12")
           assert_equal(<<~MSG, result.out)
             Hovering `lib/hover.rb:2:12`:
+            # class HoverTest
             T.class_of(HoverTest)
           MSG
         end

test/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs_test.rb

@@ -167,7 +167,7 @@ def qux; end
 
             to_pretty_format_for_humans: <<~RUBY,
               class Foo
-                extend T::Helpers
+                extend ::T::Helpers
 
                 abstract!
 
@@ -177,7 +177,7 @@ def bar; end
               end
 
               module Baz
-                extend T::Helpers
+                extend ::T::Helpers
 
                 abstract!
 
@@ -189,14 +189,14 @@ def qux; end
 
             to_line_matched_format_for_machines: <<~RUBY,
               # RBS_REWRITTEN_ANNOTATION: @abstract
-              class Foo; extend T::Helpers; abstract!
+              class Foo; extend ::T::Helpers; abstract!
                 # @abstract
                 #: -> String
                 def bar; end
               end
 
               # RBS_REWRITTEN_ANNOTATION: @abstract
-              module Baz; extend T::Helpers; abstract!
+              module Baz; extend ::T::Helpers; abstract!
                 # @abstract
                 #: -> String
                 def qux; end
@@ -481,21 +481,21 @@ class << self
 
             to_pretty_format_for_humans: <<~RUBY,
               class A
-                extend T::Helpers
+                extend ::T::Helpers
 
                 abstract!
 
                 requires_ancestor { ::T.class_of(Foo::Bar) }
 
                 module B
-                  extend T::Helpers
+                  extend ::T::Helpers
 
                   interface!
 
                   sealed!
 
                   class << self
-                    extend T::Helpers
+                    extend ::T::Helpers
 
                     final!
                   end
@@ -506,12 +506,12 @@ class << self
             to_line_matched_format_for_machines: <<~RUBY,
               # RBS_REWRITTEN_ANNOTATION: @abstract
               # RBS_REWRITTEN_ANNOTATION: @requires_ancestor: singleton(Foo::Bar)
-              class A; extend T::Helpers; abstract!; requires_ancestor { ::T.class_of(Foo::Bar) }
+              class A; extend ::T::Helpers; abstract!; requires_ancestor { ::T.class_of(Foo::Bar) }
                 # RBS_REWRITTEN_ANNOTATION: @interface
                 # RBS_REWRITTEN_ANNOTATION: @sealed
-                module B; extend T::Helpers; interface!; sealed!
+                module B; extend ::T::Helpers; interface!; sealed!
                   # RBS_REWRITTEN_ANNOTATION: @final
-                  class << self; extend T::Helpers; final!
+                  class << self; extend ::T::Helpers; final!
                   end
                 end
               end
@@ -549,7 +549,7 @@ def foo; end
               # @foo
               # @bar
               module Baz
-                extend T::Helpers
+                extend ::T::Helpers
 
                 requires_ancestor { Kernel }
 
@@ -562,7 +562,7 @@ def foo; end
               # RBS_IGNORED_UNKNOWN_ANNOTATION: @foo
               # RBS_IGNORED_UNKNOWN_ANNOTATION: @bar
               # RBS_REWRITTEN_ANNOTATION: @requires_ancestor: Kernel
-              module Baz; extend T::Helpers; requires_ancestor { Kernel }
+              module Baz; extend ::T::Helpers; requires_ancestor { Kernel }
                 sig { void }
                 def foo; end
               end
@@ -586,21 +586,21 @@ class << self
 
             to_pretty_format_for_humans: <<~RUBY,
               class A
-                extend T::Generic
+                extend ::T::Generic
 
                 A = type_member(:in)
 
                 B = type_member(:out)
 
                 module B
-                  extend T::Generic
+                  extend ::T::Generic
 
                   A = type_member
 
                   B = type_member {{ upper: C }}
 
                   class << self
-                    extend T::Generic
+                    extend ::T::Generic
 
                     A = type_member {{ fixed: ::T.class_of(Numeric) }}
                   end
@@ -610,18 +610,75 @@ class << self
 
             to_line_matched_format_for_machines: <<~RUBY,
               # RBS_WRITTEN_ANNOTATION: [in A, out B]
-              class A; extend T::Generic; A = type_member(:in); B = type_member(:out)
+              class A; extend ::T::Generic; A = type_member(:in); B = type_member(:out)
                 # RBS_WRITTEN_ANNOTATION: [A, B < C]
-                module B; extend T::Generic; A = type_member; B = type_member {{ upper: C }}
+                module B; extend ::T::Generic; A = type_member; B = type_member {{ upper: C }}
                   # RBS_WRITTEN_ANNOTATION: [A = singleton(Numeric)]
-                  class << self; extend T::Generic; A = type_member {{ fixed: ::T.class_of(Numeric) }}
+                  class << self; extend ::T::Generic; A = type_member {{ fixed: ::T.class_of(Numeric) }}
                   end
                 end
               end
             RUBY
           )
         end
 
+        def test_translate_to_rbi_fully_qualifies_extend_t_generic_and_helpers
+          assert_rewrites_rbs(
+            from: <<~RUBY,
+              # @final
+              #: [T]
+              class Box
+              end
+            RUBY
+
+            to_pretty_format_for_humans: <<~RUBY,
+              class Box
+                extend ::T::Helpers
+
+                final!
+                extend ::T::Generic
+
+                T = type_member
+              end
+            RUBY
+
+            to_line_matched_format_for_machines: <<~RUBY,
+              # RBS_REWRITTEN_ANNOTATION: @final
+              # RBS_WRITTEN_ANNOTATION: [T]
+              class Box; extend ::T::Helpers; final!; extend ::T::Generic; T = type_member
+              end
+            RUBY
+          )
+        end
+
+        def test_translate_to_rbi_with_pre_existing_t_helpers
+          assert_rewrites_rbs(
+            from: <<~RUBY,
+              # @final
+              class Box
+                extend T::Helpers
+              end
+            RUBY
+
+            to_pretty_format_for_humans: <<~RUBY,
+              class Box
+                extend ::T::Helpers
+
+                final!
+
+                extend T::Helpers
+              end
+            RUBY
+
+            to_line_matched_format_for_machines: <<~RUBY,
+              # RBS_REWRITTEN_ANNOTATION: @final
+              class Box; extend ::T::Helpers; final!
+                extend T::Helpers
+              end
+            RUBY
+          )
+        end
+
         def test_translate_to_rbi_preserves_generic_types
           contents = <<~RB
             #: -> Array[Integer]
@@ -1379,7 +1436,7 @@ class Foo
             RUBY
             to_pretty_format_for_humans: <<~RUBY,
               class Foo
-                extend T::Generic
+                extend ::T::Generic
 
                 A = type_member
                 B = type_member
@@ -1388,7 +1445,7 @@ class Foo
             to_line_matched_format_for_machines: <<~RUBY,
               # RBS_WRITTEN_ANNOTATION: [A,
               # RBS_WRITTEN_ANNOTATION: B]
-              class Foo; extend T::Generic; A = type_member; B = type_member
+              class Foo; extend ::T::Generic; A = type_member; B = type_member
               end
             RUBY
           )