ruby-lsp 0.23.16 → 0.23.18

data/lib/ruby_indexer/test/prefix_tree_test.rb

@@ -22,7 +22,7 @@ module RubyIndexer
     end
 
     def test_multiple_items
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       ["foo", "bar", "baz"].each { |item| tree.insert(item, item) }
 
       assert_equal(["baz", "bar", "foo"], tree.search(""))
@@ -34,7 +34,7 @@ module RubyIndexer
     end
 
     def test_multiple_prefixes
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       ["fo", "foo"].each { |item| tree.insert(item, item) }
 
       assert_equal(["fo", "foo"], tree.search(""))
@@ -45,7 +45,7 @@ module RubyIndexer
     end
 
     def test_multiple_prefixes_with_shuffled_order
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       [
         "foo/bar/base",
         "foo/bar/on",
@@ -97,7 +97,7 @@ module RubyIndexer
     end
 
     def test_deletion
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       ["foo/bar", "foo/baz"].each { |item| tree.insert(item, item) }
       assert_equal(["foo/baz", "foo/bar"], tree.search("foo"))
 
@@ -107,7 +107,7 @@ module RubyIndexer
     end
 
     def test_delete_does_not_impact_other_keys_with_the_same_value
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       tree.insert("key1", "value")
       tree.insert("key2", "value")
       assert_equal(["value", "value"], tree.search("key"))
@@ -118,7 +118,7 @@ module RubyIndexer
     end
 
     def test_deleted_node_is_removed_from_the_tree
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       tree.insert("foo/bar", "foo/bar")
       assert_equal(["foo/bar"], tree.search("foo"))
 
@@ -128,7 +128,7 @@ module RubyIndexer
     end
 
     def test_deleting_non_terminal_nodes
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       tree.insert("abc", "value1")
       tree.insert("abcdef", "value2")
 
@@ -138,7 +138,7 @@ module RubyIndexer
     end
 
     def test_overriding_values
-      tree = PrefixTree[Integer].new
+      tree = PrefixTree.new #: PrefixTree[Integer]
 
       tree.insert("foo/bar", 123)
       assert_equal([123], tree.search("foo/bar"))

data/lib/ruby_indexer/test/rbs_indexer_test.rb

@@ -60,7 +60,7 @@ module RubyIndexer
       entry = entries.find { |entry| entry.owner&.name == "Array" } #: as Entry::Method
       assert_match(%r{/gems/rbs-.*/core/array.rbs}, entry.file_path)
       assert_equal("array.rbs", entry.file_name)
-      assert_equal(Entry::Visibility::PUBLIC, entry.visibility)
+      assert_equal(:public, entry.visibility)
 
       # Using fixed positions would be fragile, so let's just check some basics.
       assert_operator(entry.location.start_line, :>, 0)
@@ -373,8 +373,9 @@ module RubyIndexer
       pathname = Pathname.new("/file.rbs")
       indexer.process_signature(pathname, declarations)
       entry = index[method_name] #: as !nil
-        .first
-      T.cast(entry, Entry::Method).signatures
+        .first #: as Entry::Method
+
+      entry.signatures
     end
   end
 end

data/lib/ruby_indexer/test/test_case.rb

@@ -11,6 +11,13 @@ module RubyIndexer
       @default_indexed_entries = @index.instance_variable_get(:@entries).dup
     end
 
+    def teardown
+      entries = @index.instance_variable_get(:@entries).values.flatten
+      entries.each do |entry|
+        assert_includes([:public, :private, :protected], entry.visibility)
+      end
+    end
+
     private
 
     def index(source, uri: URI::Generic.from_path(path: "/fake/path/foo.rb"))
@@ -31,7 +38,6 @@ module RubyIndexer
           ":#{location.end_line - 1}-#{location.end_column}"
 
       assert_equal(expected_location, location_string)
-
       assert_equal(visibility, entry.visibility) if visibility
     end
 

data/lib/ruby_lsp/client_capabilities.rb

@@ -10,7 +10,8 @@ module RubyLsp
       :supports_request_delegation,
       :window_show_message_supports_extra_properties,
       :supports_progress,
-      :supports_diagnostic_refresh
+      :supports_diagnostic_refresh,
+      :supports_code_lens_refresh
 
     #: -> void
     def initialize
@@ -34,6 +35,9 @@ module RubyLsp
 
       # The editor supports server initiated refresh for diagnostics
       @supports_diagnostic_refresh = false #: bool
+
+      # The editor supports server initiated refresh for code lenses
+      @supports_code_lens_refresh = false #: bool
     end
 
     #: (Hash[Symbol, untyped] capabilities) -> void
@@ -61,6 +65,7 @@ module RubyLsp
       @supports_progress = progress if progress
 
       @supports_diagnostic_refresh = workspace_capabilities.dig(:diagnostics, :refreshSupport) || false
+      @supports_code_lens_refresh = workspace_capabilities.dig(:codeLens, :refreshSupport) || false
     end
 
     #: -> bool

data/lib/ruby_lsp/document.rb

@@ -2,21 +2,12 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  #: [ParseResultType]
   class Document
-    class LanguageId < T::Enum
-      enums do
-        Ruby = new("ruby")
-        ERB = new("erb")
-        RBS = new("rbs")
-      end
-    end
-
     extend T::Sig
     extend T::Helpers
-    extend T::Generic
 
     class LocationNotFoundError < StandardError; end
-    ParseResultType = type_member
 
     # This maximum number of characters for providing expensive features, like semantic highlighting and diagnostics.
     # This is the same number used by the TypeScript extension in VS Code
@@ -71,7 +62,7 @@ module RubyLsp
       self.class == other.class && uri == other.uri && @source == other.source
     end
 
-    sig { abstract.returns(LanguageId) }
+    sig { abstract.returns(Symbol) }
     def language_id; end
 
     #: [T] (String request_name) { (Document[ParseResultType] document) -> T } -> T
@@ -94,6 +85,11 @@ module RubyLsp
       @cache[request_name]
     end
 
+    #: (String request_name) -> void
+    def clear_cache(request_name)
+      @cache[request_name] = EMPTY_CACHE
+    end
+
     #: (Array[Hash[Symbol, untyped]] edits, version: Integer) -> void
     def push_edits(edits, version:)
       edits.each do |edit|

data/lib/ruby_lsp/erb_document.rb

@@ -2,11 +2,8 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  #: [ParseResultType = Prism::ParseResult]
   class ERBDocument < Document
-    extend T::Generic
-
-    ParseResultType = type_member { { fixed: Prism::ParseResult } }
-
     #: String
     attr_reader :host_language_source
 
@@ -46,9 +43,9 @@ module RubyLsp
     end
 
     # @override
-    #: -> LanguageId
+    #: -> Symbol
     def language_id
-      LanguageId::ERB
+      :erb
     end
 
     #: (Hash[Symbol, untyped] position, ?node_types: Array[singleton(Prism::Node)]) -> NodeContext

data/lib/ruby_lsp/internal.rb

@@ -14,7 +14,12 @@ Bundler.ui.level = :silent
 
 require "json"
 require "uri"
-require "cgi"
+require "cgi/escape"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.5")
+  # Just requiring `cgi/escape` leaves CGI.unescape broken on older rubies
+  # Some background on why this is necessary: https://bugs.ruby-lang.org/issues/21258
+  require "cgi/util"
+end
 require "set"
 require "strscan"
 require "prism"

data/lib/ruby_lsp/listeners/completion.rb

@@ -50,7 +50,7 @@ module RubyLsp
         "__LINE__",
       ].freeze
 
-      #: (ResponseBuilders::CollectionResponseBuilder[Interface::CompletionItem] response_builder, GlobalState global_state, NodeContext node_context, RubyDocument::SorbetLevel sorbet_level, Prism::Dispatcher dispatcher, URI::Generic uri, String? trigger_character) -> void
+      #: (ResponseBuilders::CollectionResponseBuilder[Interface::CompletionItem] response_builder, GlobalState global_state, NodeContext node_context, SorbetLevel sorbet_level, Prism::Dispatcher dispatcher, URI::Generic uri, String? trigger_character) -> void
       def initialize( # rubocop:disable Metrics/ParameterLists
         response_builder,
         global_state,
@@ -100,7 +100,7 @@ module RubyLsp
       def on_constant_read_node_enter(node)
         # The only scenario where Sorbet doesn't provide constant completion is on ignored files. Even if the file has
         # no sigil, Sorbet will still provide completion for constants
-        return if @sorbet_level != RubyDocument::SorbetLevel::Ignore
+        return unless @sorbet_level.ignore?
 
         name = RubyIndexer::Index.constant_name(node)
         return if name.nil?
@@ -125,7 +125,7 @@ module RubyLsp
       def on_constant_path_node_enter(node)
         # The only scenario where Sorbet doesn't provide constant completion is on ignored files. Even if the file has
         # no sigil, Sorbet will still provide completion for constants
-        return if @sorbet_level != RubyDocument::SorbetLevel::Ignore
+        return unless @sorbet_level.ignore?
 
         name = begin
           node.full_name
@@ -143,7 +143,7 @@ module RubyLsp
       def on_call_node_enter(node)
         # The only scenario where Sorbet doesn't provide constant completion is on ignored files. Even if the file has
         # no sigil, Sorbet will still provide completion for constants
-        if @sorbet_level == RubyDocument::SorbetLevel::Ignore
+        if @sorbet_level.ignore?
           receiver = node.receiver
 
           # When writing `Foo::`, the AST assigns a method call node (because you can use that syntax to invoke
@@ -390,7 +390,7 @@ module RubyLsp
       def handle_instance_variable_completion(name, location)
         # Sorbet enforces that all instance variables be declared on typed strict or higher, which means it will be able
         # to provide all features for them
-        return if @sorbet_level == RubyDocument::SorbetLevel::Strict
+        return if @sorbet_level.strict?
 
         type = @type_inferrer.infer_receiver_type(@node_context)
         return unless type
@@ -475,13 +475,13 @@ module RubyLsp
       def complete_methods(node, name)
         # If the node has a receiver, then we don't need to provide local nor keyword completions. Sorbet can provide
         # local and keyword completion for any file with a Sorbet level of true or higher
-        if !sorbet_level_true_or_higher?(@sorbet_level) && !node.receiver
+        if !@sorbet_level.true_or_higher? && !node.receiver
           add_local_completions(node, name)
           add_keyword_completions(node, name)
         end
 
         # Sorbet can provide completion for methods invoked on self on typed true or higher files
-        return if sorbet_level_true_or_higher?(@sorbet_level) && self_receiver?(node)
+        return if @sorbet_level.true_or_higher? && self_receiver?(node)
 
         type = @type_inferrer.infer_receiver_type(@node_context)
         return unless type
@@ -512,7 +512,7 @@ module RubyLsp
         external_references = @node_context.fully_qualified_name != type.name
 
         @index.method_completion_candidates(method_name, type.name).each do |entry|
-          next if entry.visibility != RubyIndexer::Entry::Visibility::PUBLIC && external_references
+          next if entry.visibility != :public && external_references
 
           entry_name = entry.name
           owner_name = entry.owner&.name

data/lib/ruby_lsp/listeners/definition.rb

@@ -8,7 +8,7 @@ module RubyLsp
 
       MAX_NUMBER_OF_DEFINITION_CANDIDATES_WITHOUT_RECEIVER = 10
 
-      #: (ResponseBuilders::CollectionResponseBuilder[(Interface::Location | Interface::LocationLink)] response_builder, GlobalState global_state, Document::LanguageId language_id, URI::Generic uri, NodeContext node_context, Prism::Dispatcher dispatcher, RubyDocument::SorbetLevel sorbet_level) -> void
+      #: (ResponseBuilders::CollectionResponseBuilder[(Interface::Location | Interface::LocationLink)] response_builder, GlobalState global_state, Symbol language_id, URI::Generic uri, NodeContext node_context, Prism::Dispatcher dispatcher, SorbetLevel sorbet_level) -> void
       def initialize(response_builder, global_state, language_id, uri, node_context, dispatcher, sorbet_level) # rubocop:disable Metrics/ParameterLists
         @response_builder = response_builder
         @global_state = global_state
@@ -53,7 +53,7 @@ module RubyLsp
       #: (Prism::CallNode node) -> void
       def on_call_node_enter(node)
         # Sorbet can handle go to definition for methods invoked on self on typed true or higher
-        return if sorbet_level_true_or_higher?(@sorbet_level) && self_receiver?(node)
+        return if @sorbet_level.true_or_higher? && self_receiver?(node)
 
         message = node.message
         return unless message
@@ -62,7 +62,7 @@ module RubyLsp
 
         # Until we can properly infer the receiver type in erb files (maybe with ruby-lsp-rails),
         # treating method calls' type as `nil` will allow users to get some completion support first
-        if @language_id == Document::LanguageId::ERB && inferrer_receiver_type&.name == "Object"
+        if @language_id == :erb && inferrer_receiver_type&.name == "Object"
           inferrer_receiver_type = nil
         end
 
@@ -223,7 +223,7 @@ module RubyLsp
       #: -> void
       def handle_super_node_definition
         # Sorbet can handle super hover on typed true or higher
-        return if sorbet_level_true_or_higher?(@sorbet_level)
+        return if @sorbet_level.true_or_higher?
 
         surrounding_method = @node_context.surrounding_method
         return unless surrounding_method
@@ -276,7 +276,7 @@ module RubyLsp
       def handle_instance_variable_definition(name)
         # Sorbet enforces that all instance variables be declared on typed strict or higher, which means it will be able
         # to provide all features for them
-        return if @sorbet_level == RubyDocument::SorbetLevel::Strict
+        return if @sorbet_level.strict?
 
         type = @type_inferrer.infer_receiver_type(@node_context)
         return unless type
@@ -317,7 +317,7 @@ module RubyLsp
         methods.each do |target_method|
           uri = target_method.uri
           full_path = uri.full_path
-          next if sorbet_level_true_or_higher?(@sorbet_level) && (!full_path || not_in_dependencies?(full_path))
+          next if @sorbet_level.true_or_higher? && (!full_path || not_in_dependencies?(full_path))
 
           @response_builder << Interface::LocationLink.new(
             target_uri: uri.to_s,
@@ -392,7 +392,7 @@ module RubyLsp
           uri = entry.uri
           full_path = uri.full_path
 
-          if @sorbet_level != RubyDocument::SorbetLevel::Ignore && (!full_path || not_in_dependencies?(full_path))
+          if !@sorbet_level.ignore? && (!full_path || not_in_dependencies?(full_path))
             next
           end
 

data/lib/ruby_lsp/listeners/document_link.rb

@@ -105,16 +105,13 @@ module RubyLsp
         match = comment.location.slice.match(%r{source://.*#\d+$})
         return unless match
 
-        uri = T.cast(
-          begin
-            URI(
-              match[0], #: as !nil
-            )
-          rescue URI::Error
-            nil
-          end,
-          T.nilable(URI::Source),
-        )
+        uri =  begin
+          URI(
+            match[0], #: as !nil
+          )
+        rescue URI::Error
+          nil
+        end #: as URI::Source?
         return unless uri
 
         gem_version = resolve_version(uri)

data/lib/ruby_lsp/listeners/hover.rb

@@ -42,7 +42,7 @@ module RubyLsp
         "https://gitlab.com",
       ].freeze #: Array[String]
 
-      #: (ResponseBuilders::Hover response_builder, GlobalState global_state, URI::Generic uri, NodeContext node_context, Prism::Dispatcher dispatcher, RubyDocument::SorbetLevel sorbet_level) -> void
+      #: (ResponseBuilders::Hover response_builder, GlobalState global_state, URI::Generic uri, NodeContext node_context, Prism::Dispatcher dispatcher, SorbetLevel sorbet_level) -> void
       def initialize(response_builder, global_state, uri, node_context, dispatcher, sorbet_level) # rubocop:disable Metrics/ParameterLists
         @response_builder = response_builder
         @global_state = global_state
@@ -86,6 +86,14 @@ module RubyLsp
 
       #: (Prism::StringNode node) -> void
       def on_string_node_enter(node)
+        if @path && File.basename(@path) == GEMFILE_NAME
+          call_node = @node_context.call_node
+          if call_node && call_node.name == :gem && call_node.arguments&.arguments&.first == node
+            generate_gem_hover(call_node)
+            return
+          end
+        end
+
         generate_heredoc_hover(node)
       end
 
@@ -96,7 +104,7 @@ module RubyLsp
 
       #: (Prism::ConstantReadNode node) -> void
       def on_constant_read_node_enter(node)
-        return if @sorbet_level != RubyDocument::SorbetLevel::Ignore
+        return unless @sorbet_level.ignore?
 
         name = RubyIndexer::Index.constant_name(node)
         return if name.nil?
@@ -106,14 +114,14 @@ module RubyLsp
 
       #: (Prism::ConstantWriteNode node) -> void
       def on_constant_write_node_enter(node)
-        return if @sorbet_level != RubyDocument::SorbetLevel::Ignore
+        return unless @sorbet_level.ignore?
 
         generate_hover(node.name.to_s, node.name_loc)
       end
 
       #: (Prism::ConstantPathNode node) -> void
       def on_constant_path_node_enter(node)
-        return if @sorbet_level != RubyDocument::SorbetLevel::Ignore
+        return unless @sorbet_level.ignore?
 
         name = RubyIndexer::Index.constant_name(node)
         return if name.nil?
@@ -123,12 +131,7 @@ module RubyLsp
 
       #: (Prism::CallNode node) -> void
       def on_call_node_enter(node)
-        if @path && File.basename(@path) == GEMFILE_NAME && node.name == :gem
-          generate_gem_hover(node)
-          return
-        end
-
-        return if sorbet_level_true_or_higher?(@sorbet_level) && self_receiver?(node)
+        return if @sorbet_level.true_or_higher? && self_receiver?(node)
 
         message = node.message
         return unless message
@@ -283,7 +286,7 @@ module RubyLsp
       #: -> void
       def handle_super_node_hover
         # Sorbet can handle super hover on typed true or higher
-        return if sorbet_level_true_or_higher?(@sorbet_level)
+        return if @sorbet_level.true_or_higher?
 
         surrounding_method = @node_context.surrounding_method
         return unless surrounding_method
@@ -318,7 +321,7 @@ module RubyLsp
       def handle_instance_variable_hover(name)
         # Sorbet enforces that all instance variables be declared on typed strict or higher, which means it will be able
         # to provide all features for them
-        return if @sorbet_level == RubyDocument::SorbetLevel::Strict
+        return if @sorbet_level.strict?
 
         type = @type_inferrer.infer_receiver_type(@node_context)
         return unless type
@@ -366,9 +369,10 @@ module RubyLsp
         # We should only show hover for private constants if the constant is defined in the same namespace as the
         # reference
         first_entry = entries.first #: as !nil
-        return if first_entry.private? && first_entry.name != "#{@node_context.fully_qualified_name}::#{name}"
+        full_name = first_entry.name
+        return if first_entry.private? && full_name != "#{@node_context.fully_qualified_name}::#{name}"
 
-        categorized_markdown_from_index_entries(name, entries).each do |category, content|
+        categorized_markdown_from_index_entries(full_name, entries).each do |category, content|
           @response_builder.push(content, category: category)
         end
       end

data/lib/ruby_lsp/listeners/signature_help.rb

@@ -6,7 +6,7 @@ module RubyLsp
     class SignatureHelp
       include Requests::Support::Common
 
-      #: (ResponseBuilders::SignatureHelp response_builder, GlobalState global_state, NodeContext node_context, Prism::Dispatcher dispatcher, RubyDocument::SorbetLevel sorbet_level) -> void
+      #: (ResponseBuilders::SignatureHelp response_builder, GlobalState global_state, NodeContext node_context, Prism::Dispatcher dispatcher, SorbetLevel sorbet_level) -> void
       def initialize(response_builder, global_state, node_context, dispatcher, sorbet_level)
         @sorbet_level = sorbet_level
         @response_builder = response_builder
@@ -19,7 +19,7 @@ module RubyLsp
 
       #: (Prism::CallNode node) -> void
       def on_call_node_enter(node)
-        return if sorbet_level_true_or_higher?(@sorbet_level)
+        return if @sorbet_level.true_or_higher?
 
         message = node.message
         return unless message

data/lib/ruby_lsp/listeners/spec_style.rb

@@ -4,9 +4,7 @@
 module RubyLsp
   module Listeners
     class SpecStyle < TestDiscovery
-      extend T::Sig
-
-      #: (response_builder: ResponseBuilders::TestCollection, global_state: GlobalState, dispatcher: Prism::Dispatcher, uri: URI::Generic) -> void
+      #: (ResponseBuilders::TestCollection, GlobalState, Prism::Dispatcher, URI::Generic) -> void
       def initialize(response_builder, global_state, dispatcher, uri)
         super
 
@@ -22,7 +20,7 @@ module RubyLsp
         )
       end
 
-      #: (node: Prism::ClassNode) -> void
+      #: (Prism::ClassNode) -> void
       def on_class_node_enter(node)
         with_test_ancestor_tracking(node) do |_, ancestors|
           is_spec = ancestors.include?("Minitest::Spec")
@@ -30,14 +28,14 @@ module RubyLsp
         end
       end
 
-      #: (node: Prism::ClassNode) -> void
+      #: (Prism::ClassNode) -> void
       def on_class_node_leave(node) # rubocop:disable RubyLsp/UseRegisterWithHandlerMethod
         super
 
         @spec_class_stack.pop
       end
 
-      #: (node: Prism::CallNode) -> void
+      #: (Prism::CallNode) -> void
       def on_call_node_enter(node)
         case node.name
         when :describe
@@ -47,7 +45,7 @@ module RubyLsp
         end
       end
 
-      #: (node: Prism::CallNode) -> void
+      #: (Prism::CallNode) -> void
       def on_call_node_leave(node)
         return unless node.name == :describe && !node.receiver
 
@@ -56,7 +54,7 @@ module RubyLsp
 
       private
 
-      #: (node: Prism::CallNode) -> void
+      #: (Prism::CallNode) -> void
       def handle_describe(node)
         return if node.block.nil?
 
@@ -74,6 +72,7 @@ module RubyLsp
             framework: :minitest,
           )
           @response_builder.add(test_item)
+          @response_builder.add_code_lens(test_item)
         else
           add_to_parent_test_group(description, node)
         end
@@ -81,7 +80,7 @@ module RubyLsp
         @describe_block_nesting << description
       end
 
-      #: (node: Prism::CallNode) -> void
+      #: (Prism::CallNode) -> void
       def handle_example(node)
         return unless in_spec_context?
 
@@ -93,7 +92,7 @@ module RubyLsp
         add_to_parent_test_group(description, node)
       end
 
-      #: (description: String, node: Prism::CallNode) -> void
+      #: (String, Prism::CallNode) -> void
       def add_to_parent_test_group(description, node)
         parent_test_group = find_parent_test_group
         return unless parent_test_group
@@ -106,6 +105,7 @@ module RubyLsp
           framework: :minitest,
         )
         parent_test_group.add(test_item)
+        @response_builder.add_code_lens(test_item)
       end
 
       #: -> Requests::Support::TestItem?
@@ -129,7 +129,7 @@ module RubyLsp
         test_group
       end
 
-      #: (node: Prism::CallNode) -> String?
+      #: (Prism::CallNode) -> String?
       def extract_description(node)
         first_argument = node.arguments&.arguments&.first
         return unless first_argument

data/lib/ruby_lsp/listeners/test_discovery.rb

@@ -71,7 +71,7 @@ module RubyLsp
         slice.gsub(/((?<=::)|^)[a-z]\w*/, DYNAMIC_REFERENCE_MARKER)
       end
 
-      #: (Prism::ClassNode node, ^(String name, Array[String] ancestors) -> void block) -> void
+      #: (Prism::ClassNode node) { (String name, Array[String] ancestors) -> void } -> void
       def with_test_ancestor_tracking(node, &block)
         @visibility_stack << :public
         name = constant_name(node.constant_path)

data/lib/ruby_lsp/listeners/test_style.rb

@@ -143,7 +143,7 @@ module RubyLsp
         "ruby"
       end #: String
 
-      #: (ResponseBuilders::TestCollection response_builder, GlobalState global_state, Prism::Dispatcher dispatcher, URI::Generic uri) -> void
+      #: (ResponseBuilders::TestCollection, GlobalState, Prism::Dispatcher, URI::Generic) -> void
       def initialize(response_builder, global_state, dispatcher, uri)
         super
 
@@ -165,13 +165,16 @@ module RubyLsp
           @framework = :test_unit if ancestors.include?("Test::Unit::TestCase")
 
           if @framework == :test_unit || non_declarative_minitest?(ancestors, name)
-            @response_builder.add(Requests::Support::TestItem.new(
+            test_item = Requests::Support::TestItem.new(
               name,
               name,
               @uri,
               range_from_node(node),
               framework: @framework,
-            ))
+            )
+
+            @response_builder.add(test_item)
+            @response_builder.add_code_lens(test_item)
           end
         end
       end
@@ -191,13 +194,15 @@ module RubyLsp
         test_item = @response_builder[current_group_name]
         return unless test_item
 
-        test_item.add(Requests::Support::TestItem.new(
+        example_item = Requests::Support::TestItem.new(
           "#{current_group_name}##{name}",
           name,
           @uri,
           range_from_node(node),
           framework: @framework,
-        ))
+        )
+        test_item.add(example_item)
+        @response_builder.add_code_lens(example_item)
       end
 
       #: (Prism::CallNode node) -> void

data/lib/ruby_lsp/rbs_document.rb

@@ -2,11 +2,8 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  #: [ParseResultType = Array[RBS::AST::Declarations::Base]]
   class RBSDocument < Document
-    extend T::Generic
-
-    ParseResultType = type_member { { fixed: T::Array[RBS::AST::Declarations::Base] } }
-
     #: (source: String, version: Integer, uri: URI::Generic, global_state: GlobalState) -> void
     def initialize(source:, version:, uri:, global_state:)
       @syntax_error = false #: bool
@@ -36,9 +33,9 @@ module RubyLsp
     end
 
     # @override
-    #: -> LanguageId
+    #: -> Symbol
     def language_id
-      LanguageId::RBS
+      :rbs
     end
   end
 end