ruby-lsp 0.23.11 → 0.23.13

data/lib/ruby_lsp/listeners/document_link.rb

@@ -6,78 +6,59 @@ require "ruby_lsp/requests/support/source_uri"
 module RubyLsp
   module Listeners
     class DocumentLink
-      extend T::Sig
       include Requests::Support::Common
 
-      GEM_TO_VERSION_MAP = T.let(
-        [*::Gem::Specification.default_stubs, *::Gem::Specification.stubs].map! do |s|
-          [s.name, s.version.to_s]
-        end.to_h.freeze,
-        T::Hash[String, String],
-      )
+      GEM_TO_VERSION_MAP = [*::Gem::Specification.default_stubs, *::Gem::Specification.stubs].map! do |s|
+        [s.name, s.version.to_s]
+      end.to_h.freeze #: Hash[String, String]
 
       class << self
-        extend T::Sig
-
-        sig { returns(T::Hash[String, T::Hash[String, T::Hash[String, String]]]) }
+        #: -> Hash[String, Hash[String, Hash[String, String]]]
         def gem_paths
-          @gem_paths ||= T.let(
-            begin
-              lookup = {}
-
-              Gem::Specification.stubs.each do |stub|
-                spec = stub.to_spec
-                lookup[spec.name] = {}
-                lookup[spec.name][spec.version.to_s] = {}
-
-                Dir.glob("**/*.rb", base: "#{spec.full_gem_path.delete_prefix("//?/")}/").each do |path|
-                  lookup[spec.name][spec.version.to_s][path] = "#{spec.full_gem_path}/#{path}"
-                end
-              end
+          @gem_paths ||= begin
+            lookup = {}
 
-              Gem::Specification.default_stubs.each do |stub|
-                spec = stub.to_spec
-                lookup[spec.name] = {}
-                lookup[spec.name][spec.version.to_s] = {}
-                prefix_matchers = Regexp.union(spec.require_paths.map do |rp|
-                                                 Regexp.new("^#{rp}/")
-                                               end)
-                prefix_matcher = Regexp.union(prefix_matchers, //)
-
-                spec.files.each do |file|
-                  path = file.sub(prefix_matcher, "")
-                  lookup[spec.name][spec.version.to_s][path] = "#{RbConfig::CONFIG["rubylibdir"]}/#{path}"
-                end
+            Gem::Specification.stubs.each do |stub|
+              spec = stub.to_spec
+              lookup[spec.name] = {}
+              lookup[spec.name][spec.version.to_s] = {}
+
+              Dir.glob("**/*.rb", base: "#{spec.full_gem_path.delete_prefix("//?/")}/").each do |path|
+                lookup[spec.name][spec.version.to_s][path] = "#{spec.full_gem_path}/#{path}"
+              end
+            end
+
+            Gem::Specification.default_stubs.each do |stub|
+              spec = stub.to_spec
+              lookup[spec.name] = {}
+              lookup[spec.name][spec.version.to_s] = {}
+              prefix_matchers = Regexp.union(spec.require_paths.map do |rp|
+                                               Regexp.new("^#{rp}/")
+                                             end)
+              prefix_matcher = Regexp.union(prefix_matchers, //)
+
+              spec.files.each do |file|
+                path = file.sub(prefix_matcher, "")
+                lookup[spec.name][spec.version.to_s][path] = "#{RbConfig::CONFIG["rubylibdir"]}/#{path}"
               end
+            end
 
-              lookup
-            end,
-            T.nilable(T::Hash[String, T::Hash[String, T::Hash[String, String]]]),
-          )
+            lookup
+          end #: Hash[String, Hash[String, Hash[String, String]]]?
         end
       end
 
-      sig do
-        params(
-          response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::DocumentLink],
-          uri: URI::Generic,
-          comments: T::Array[Prism::Comment],
-          dispatcher: Prism::Dispatcher,
-        ).void
-      end
+      #: (ResponseBuilders::CollectionResponseBuilder[Interface::DocumentLink] response_builder, URI::Generic uri, Array[Prism::Comment] comments, Prism::Dispatcher dispatcher) -> void
       def initialize(response_builder, uri, comments, dispatcher)
         # Match the version based on the version in the RBI file name. Notice that the `@` symbol is sanitized to `%40`
         # in the URI
         @response_builder = response_builder
         path = uri.to_standardized_path
         version_match = path ? /(?<=%40)[\d.]+(?=\.rbi$)/.match(path) : nil
-        @gem_version = T.let(version_match && version_match[0], T.nilable(String))
-        @lines_to_comments = T.let(
-          comments.to_h do |comment|
-            [comment.location.end_line, comment]
-          end,
-          T::Hash[Integer, Prism::Comment],
-        )
+        @gem_version = version_match && version_match[0] #: String?
+        @lines_to_comments = comments.to_h do |comment|
+          [comment.location.end_line, comment]
+        end #: Hash[Integer, Prism::Comment]
 
         dispatcher.register(
           self,
@@ -89,34 +70,34 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::DefNode).void }
+      #: (Prism::DefNode node) -> void
       def on_def_node_enter(node)
         extract_document_link(node)
       end
 
-      sig { params(node: Prism::ClassNode).void }
+      #: (Prism::ClassNode node) -> void
       def on_class_node_enter(node)
         extract_document_link(node)
       end
 
-      sig { params(node: Prism::ModuleNode).void }
+      #: (Prism::ModuleNode node) -> void
       def on_module_node_enter(node)
         extract_document_link(node)
       end
 
-      sig { params(node: Prism::ConstantWriteNode).void }
+      #: (Prism::ConstantWriteNode node) -> void
       def on_constant_write_node_enter(node)
         extract_document_link(node)
       end
 
-      sig { params(node: Prism::ConstantPathWriteNode).void }
+      #: (Prism::ConstantPathWriteNode node) -> void
       def on_constant_path_write_node_enter(node)
         extract_document_link(node)
       end
 
       private
 
-      sig { params(node: Prism::Node).void }
+      #: (Prism::Node node) -> void
       def extract_document_link(node)
         comment = @lines_to_comments[node.location.start_line - 1]
         return unless comment
@@ -157,7 +138,7 @@ module RubyLsp
       # 1. The version in the URI
       # 2. The version in the RBI file name
       # 3. The version from the gemspec
-      sig { params(uri: URI::Source).returns(T.nilable(String)) }
+      #: (URI::Source uri) -> String?
       def resolve_version(uri)
         version = uri.gem_version
         return version unless version.nil? || version.empty?

data/lib/ruby_lsp/listeners/document_symbol.rb

@@ -4,18 +4,11 @@
 module RubyLsp
   module Listeners
     class DocumentSymbol
-      extend T::Sig
       include Requests::Support::Common
 
-      ATTR_ACCESSORS = T.let([:attr_reader, :attr_writer, :attr_accessor].freeze, T::Array[Symbol])
+      ATTR_ACCESSORS = [:attr_reader, :attr_writer, :attr_accessor].freeze #: Array[Symbol]
 
-      sig do
-        params(
-          response_builder: ResponseBuilders::DocumentSymbol,
-          uri: URI::Generic,
-          dispatcher: Prism::Dispatcher,
-        ).void
-      end
+      #: (ResponseBuilders::DocumentSymbol response_builder, URI::Generic uri, Prism::Dispatcher dispatcher) -> void
       def initialize(response_builder, uri, dispatcher)
         @response_builder = response_builder
         @uri = uri
@@ -52,7 +45,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ClassNode).void }
+      #: (Prism::ClassNode node) -> void
       def on_class_node_enter(node)
         @response_builder << create_document_symbol(
           name: node.constant_path.location.slice,
@@ -62,12 +55,12 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ClassNode).void }
+      #: (Prism::ClassNode node) -> void
       def on_class_node_leave(node)
         @response_builder.pop
       end
 
-      sig { params(node: Prism::SingletonClassNode).void }
+      #: (Prism::SingletonClassNode node) -> void
       def on_singleton_class_node_enter(node)
         expression = node.expression
 
@@ -79,12 +72,12 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::SingletonClassNode).void }
+      #: (Prism::SingletonClassNode node) -> void
       def on_singleton_class_node_leave(node)
         @response_builder.pop
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode node) -> void
       def on_call_node_enter(node)
         node_name = node.name
         if ATTR_ACCESSORS.include?(node_name)
@@ -98,7 +91,7 @@ module RubyLsp
         end
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode node) -> void
       def on_call_node_leave(node)
         return unless rake?
 
@@ -107,7 +100,7 @@ module RubyLsp
         end
       end
 
-      sig { params(node: Prism::ConstantPathWriteNode).void }
+      #: (Prism::ConstantPathWriteNode node) -> void
       def on_constant_path_write_node_enter(node)
         create_document_symbol(
           name: node.target.location.slice,
@@ -117,7 +110,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantWriteNode).void }
+      #: (Prism::ConstantWriteNode node) -> void
       def on_constant_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -127,7 +120,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantPathAndWriteNode).void }
+      #: (Prism::ConstantPathAndWriteNode node) -> void
       def on_constant_path_and_write_node_enter(node)
         create_document_symbol(
           name: node.target.location.slice,
@@ -137,7 +130,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantPathOrWriteNode).void }
+      #: (Prism::ConstantPathOrWriteNode node) -> void
       def on_constant_path_or_write_node_enter(node)
         create_document_symbol(
           name: node.target.location.slice,
@@ -147,7 +140,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantPathOperatorWriteNode).void }
+      #: (Prism::ConstantPathOperatorWriteNode node) -> void
       def on_constant_path_operator_write_node_enter(node)
         create_document_symbol(
           name: node.target.location.slice,
@@ -157,7 +150,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantOrWriteNode).void }
+      #: (Prism::ConstantOrWriteNode node) -> void
       def on_constant_or_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -167,7 +160,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantAndWriteNode).void }
+      #: (Prism::ConstantAndWriteNode node) -> void
       def on_constant_and_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -177,7 +170,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantOperatorWriteNode).void }
+      #: (Prism::ConstantOperatorWriteNode node) -> void
       def on_constant_operator_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -187,7 +180,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantTargetNode).void }
+      #: (Prism::ConstantTargetNode node) -> void
       def on_constant_target_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -197,7 +190,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::ConstantPathTargetNode).void }
+      #: (Prism::ConstantPathTargetNode node) -> void
       def on_constant_path_target_node_enter(node)
         create_document_symbol(
           name: node.slice,
@@ -207,12 +200,12 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::DefNode).void }
+      #: (Prism::DefNode node) -> void
       def on_def_node_leave(node)
         @response_builder.pop
       end
 
-      sig { params(node: Prism::ModuleNode).void }
+      #: (Prism::ModuleNode node) -> void
       def on_module_node_enter(node)
         @response_builder << create_document_symbol(
           name: node.constant_path.location.slice,
@@ -222,7 +215,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::DefNode).void }
+      #: (Prism::DefNode node) -> void
       def on_def_node_enter(node)
         receiver = node.receiver
         previous_symbol = @response_builder.last
@@ -248,12 +241,12 @@ module RubyLsp
         @response_builder << symbol
       end
 
-      sig { params(node: Prism::ModuleNode).void }
+      #: (Prism::ModuleNode node) -> void
       def on_module_node_leave(node)
         @response_builder.pop
       end
 
-      sig { params(node: Prism::ClassVariableWriteNode).void }
+      #: (Prism::ClassVariableWriteNode node) -> void
       def on_class_variable_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -263,7 +256,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::InstanceVariableWriteNode).void }
+      #: (Prism::InstanceVariableWriteNode node) -> void
       def on_instance_variable_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -273,7 +266,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::InstanceVariableTargetNode).void }
+      #: (Prism::InstanceVariableTargetNode node) -> void
       def on_instance_variable_target_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -283,7 +276,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::InstanceVariableOperatorWriteNode).void }
+      #: (Prism::InstanceVariableOperatorWriteNode node) -> void
       def on_instance_variable_operator_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -293,7 +286,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::InstanceVariableOrWriteNode).void }
+      #: (Prism::InstanceVariableOrWriteNode node) -> void
       def on_instance_variable_or_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -303,7 +296,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::InstanceVariableAndWriteNode).void }
+      #: (Prism::InstanceVariableAndWriteNode node) -> void
       def on_instance_variable_and_write_node_enter(node)
         create_document_symbol(
           name: node.name.to_s,
@@ -313,7 +306,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::AliasMethodNode).void }
+      #: (Prism::AliasMethodNode node) -> void
       def on_alias_method_node_enter(node)
         new_name_node = node.new_name
         return unless new_name_node.is_a?(Prism::SymbolNode)
@@ -331,14 +324,7 @@ module RubyLsp
 
       private
 
-      sig do
-        params(
-          name: String,
-          kind: Integer,
-          range_location: Prism::Location,
-          selection_range_location: Prism::Location,
-        ).returns(Interface::DocumentSymbol)
-      end
+      #: (name: String, kind: Integer, range_location: Prism::Location, selection_range_location: Prism::Location) -> Interface::DocumentSymbol
       def create_document_symbol(name:, kind:, range_location:, selection_range_location:)
         name = "<blank>" if name.strip.empty?
         symbol = Interface::DocumentSymbol.new(
@@ -354,7 +340,7 @@ module RubyLsp
         symbol
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode node) -> void
       def handle_attr_accessor(node)
         receiver = node.receiver
         return if receiver && !receiver.is_a?(Prism::SelfNode)
@@ -387,7 +373,7 @@ module RubyLsp
         end
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode node) -> void
       def handle_alias_method(node)
         receiver = node.receiver
         return if receiver && !receiver.is_a?(Prism::SelfNode)
@@ -420,7 +406,7 @@ module RubyLsp
         end
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode node) -> void
       def handle_rake_namespace(node)
         return unless rake?
         return if node.receiver
@@ -446,7 +432,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode node) -> void
       def handle_rake_task(node)
         return unless rake?
         return if node.receiver
@@ -481,7 +467,7 @@ module RubyLsp
         )
       end
 
-      sig { returns(T::Boolean) }
+      #: -> bool
       def rake?
         if (path = @uri.to_standardized_path)
           path.match?(/(Rakefile|\.rake)$/)