ruby-lsp 0.23.10 → 0.23.13

data/lib/ruby_lsp/listeners/test_style.rb

@@ -0,0 +1,236 @@
+# typed: strict
+# frozen_string_literal: true
+
+module RubyLsp
+  module Listeners
+    class TestStyle < TestDiscovery
+      class << self
+        # Resolves the minimal set of commands required to execute the requested tests
+        #: (Array[Hash[Symbol, untyped]]) -> Array[String]
+        def resolve_test_commands(items)
+          # A nested hash of file_path => test_group => { tags: [], examples: [test_example] } to ensure we build the
+          # minimum amount of commands needed to execute the requested tests. This is only used for specific examples
+          # where we will need more complex regexes to execute it all at the same time
+          aggregated_tests = Hash.new do |hash, key|
+            hash[key] = Hash.new do |inner_h, inner_k|
+              inner_h[inner_k] = { tags: Set.new, examples: [] }
+            end
+          end
+
+          # Full files are paths that should be executed as a whole e.g.: an entire test file or directory
+          full_files = []
+          queue = items.dup
+
+          until queue.empty?
+            item = T.must(queue.shift)
+            tags = Set.new(item[:tags])
+            next unless tags.include?("framework:minitest") || tags.include?("framework:test_unit")
+
+            children = item[:children]
+            uri = URI(item[:uri])
+            path = uri.full_path
+            next unless path
+
+            if tags.include?("test_dir")
+              if children.empty?
+                full_files.concat(Dir.glob(
+                  "#{path}/**/{*_test,test_*}.rb",
+                  File::Constants::FNM_EXTGLOB | File::Constants::FNM_PATHNAME,
+                ))
+              end
+            elsif tags.include?("test_file")
+              full_files << path if children.empty?
+            elsif tags.include?("test_group")
+              # If all of the children of the current test group are other groups, then there's no need to add it to the
+              # aggregated examples
+              unless children.any? && children.all? { |child| child[:tags].include?("test_group") }
+                aggregated_tests[path][item[:label]] = { tags: tags, examples: [] }
+              end
+            else
+              class_name, method_name = item[:id].split("#")
+              aggregated_tests[path][class_name][:examples] << method_name
+              aggregated_tests[path][class_name][:tags].merge(tags)
+            end
+
+            queue.concat(children) unless children.empty?
+          end
+
+          commands = []
+
+          aggregated_tests.each do |file_path, groups_and_examples|
+            # Separate groups into Minitest and Test Unit. You can have both frameworks in the same file, but you cannot
+            # have a group belongs to both at the same time
+            minitest_groups, test_unit_groups = groups_and_examples.partition do |_, info|
+              info[:tags].include?("framework:minitest")
+            end
+
+            if minitest_groups.any?
+              commands << handle_minitest_groups(file_path, minitest_groups)
+            end
+
+            if test_unit_groups.any?
+              commands.concat(handle_test_unit_groups(file_path, test_unit_groups))
+            end
+          end
+
+          unless full_files.empty?
+            commands << "#{BASE_COMMAND} -Itest -e \"ARGV.each { |f| require f }\" #{full_files.join(" ")}"
+          end
+
+          commands
+        end
+
+        private
+
+        #: (String, Hash[String, Hash[Symbol, untyped]]) -> String
+        def handle_minitest_groups(file_path, groups_and_examples)
+          regexes = groups_and_examples.flat_map do |group, info|
+            examples = info[:examples]
+            group_regex = Shellwords.escape(group).gsub(
+              Shellwords.escape(TestDiscovery::DYNAMIC_REFERENCE_MARKER),
+              ".*",
+            )
+            if examples.empty?
+              "^#{group_regex}(#|::)"
+            elsif examples.length == 1
+              "^#{group_regex}##{examples[0]}$"
+            else
+              "^#{group_regex}#(#{examples.join("|")})$"
+            end
+          end
+
+          regex = if regexes.length == 1
+            regexes[0]
+          else
+            "(#{regexes.join("|")})"
+          end
+
+          "#{BASE_COMMAND} -Itest #{file_path} --name \"/#{regex}/\""
+        end
+
+        #: (String, Hash[String, Hash[Symbol, untyped]]) -> Array[String]
+        def handle_test_unit_groups(file_path, groups_and_examples)
+          groups_and_examples.map do |group, info|
+            examples = info[:examples]
+            group_regex = Shellwords.escape(group).gsub(
+              Shellwords.escape(TestDiscovery::DYNAMIC_REFERENCE_MARKER),
+              ".*",
+            )
+            command = +"#{BASE_COMMAND} -Itest #{file_path} --testcase \"/^#{group_regex}$/\""
+
+            unless examples.empty?
+              command << if examples.length == 1
+                " --name \"/#{examples[0]}$/\""
+              else
+                " --name \"/(#{examples.join("|")})$/\""
+              end
+            end
+
+            command
+          end
+        end
+      end
+
+      include Requests::Support::Common
+
+      MINITEST_REPORTER_PATH = File.expand_path("../ruby_lsp_reporter_plugin.rb", __dir__) #: String
+      TEST_UNIT_REPORTER_PATH = File.expand_path("../test_unit_test_runner.rb", __dir__) #: String
+      ACCESS_MODIFIERS = [:public, :private, :protected].freeze
+      BASE_COMMAND = begin
+        Bundler.with_original_env { Bundler.default_lockfile }
+        "bundle exec ruby"
+      rescue Bundler::GemfileNotFound
+        "ruby"
+      end #: String
+
+      #: (ResponseBuilders::TestCollection response_builder, GlobalState global_state, Prism::Dispatcher dispatcher, URI::Generic uri) -> void
+      def initialize(response_builder, global_state, dispatcher, uri)
+        super
+
+        @framework = :minitest #: Symbol
+
+        dispatcher.register(
+          self,
+          # Common handlers registered in parent class
+          :on_class_node_enter,
+          :on_def_node_enter,
+          :on_call_node_enter,
+          :on_call_node_leave,
+        )
+      end
+
+      #: (Prism::ClassNode node) -> void
+      def on_class_node_enter(node)
+        with_test_ancestor_tracking(node) do |name, ancestors|
+          @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(
+              name,
+              name,
+              @uri,
+              range_from_node(node),
+              framework: @framework,
+            ))
+          end
+        end
+      end
+
+      #: (Prism::DefNode node) -> void
+      def on_def_node_enter(node)
+        return if @visibility_stack.last != :public
+
+        name = node.name.to_s
+        return unless name.start_with?("test_")
+
+        current_group_name = RubyIndexer::Index.actual_nesting(@nesting, nil).join("::")
+
+        # If we're finding a test method, but for the wrong framework, then the group test item will not have been
+        # previously pushed and thus we return early and avoid adding items for a framework this listener is not
+        # interested in
+        test_item = @response_builder[current_group_name]
+        return unless test_item
+
+        test_item.add(Requests::Support::TestItem.new(
+          "#{current_group_name}##{name}",
+          name,
+          @uri,
+          range_from_node(node),
+          framework: @framework,
+        ))
+      end
+
+      #: (Prism::CallNode node) -> void
+      def on_call_node_enter(node)
+        name = node.name
+        return unless ACCESS_MODIFIERS.include?(name)
+
+        @visibility_stack << name
+      end
+
+      #: (Prism::CallNode node) -> void
+      def on_call_node_leave(node)
+        name = node.name
+        return unless ACCESS_MODIFIERS.include?(name)
+        return unless node.arguments&.arguments
+
+        @visibility_stack.pop
+      end
+
+      private
+
+      #: (Array[String] attached_ancestors, String fully_qualified_name) -> bool
+      def non_declarative_minitest?(attached_ancestors, fully_qualified_name)
+        return false unless attached_ancestors.include?("Minitest::Test")
+
+        # We only support regular Minitest tests. The declarative syntax provided by ActiveSupport is handled by the
+        # Rails add-on
+        name_parts = fully_qualified_name.split("::")
+        singleton_name = "#{name_parts.join("::")}::<Class:#{name_parts.last}>"
+        !@index.linearized_ancestors_of(singleton_name).include?("ActiveSupport::Testing::Declarative")
+      rescue RubyIndexer::Index::NonExistingNamespaceError
+        true
+      end
+    end
+  end
+end

data/lib/ruby_lsp/node_context.rb

@@ -5,36 +5,19 @@ module RubyLsp
   # This class allows listeners to access contextual information about a node in the AST, such as its parent,
   # its namespace nesting, and the surrounding CallNode (e.g. a method call).
   class NodeContext
-    extend T::Sig
-
-    sig { returns(T.nilable(Prism::Node)) }
+    #: Prism::Node?
     attr_reader :node, :parent
 
-    sig { returns(T::Array[String]) }
+    #: Array[String]
     attr_reader :nesting
 
-    sig { returns(T.nilable(Prism::CallNode)) }
+    #: Prism::CallNode?
     attr_reader :call_node
 
-    sig { returns(T.nilable(String)) }
+    #: String?
     attr_reader :surrounding_method
 
-    sig do
-      params(
-        node: T.nilable(Prism::Node),
-        parent: T.nilable(Prism::Node),
-        nesting_nodes: T::Array[T.any(
-          Prism::ClassNode,
-          Prism::ModuleNode,
-          Prism::SingletonClassNode,
-          Prism::DefNode,
-          Prism::BlockNode,
-          Prism::LambdaNode,
-          Prism::ProgramNode,
-        )],
-        call_node: T.nilable(Prism::CallNode),
-      ).void
-    end
+    #: (Prism::Node? node, Prism::Node? parent, Array[(Prism::ClassNode | Prism::ModuleNode | Prism::SingletonClassNode | Prism::DefNode | Prism::BlockNode | Prism::LambdaNode | Prism::ProgramNode)] nesting_nodes, Prism::CallNode? call_node) -> void
     def initialize(node, parent, nesting_nodes, call_node)
       @node = node
       @parent = parent
@@ -42,16 +25,16 @@ module RubyLsp
       @call_node = call_node
 
       nesting, surrounding_method = handle_nesting_nodes(nesting_nodes)
-      @nesting = T.let(nesting, T::Array[String])
-      @surrounding_method = T.let(surrounding_method, T.nilable(String))
+      @nesting = nesting #: Array[String]
+      @surrounding_method = surrounding_method #: String?
     end
 
-    sig { returns(String) }
+    #: -> String
     def fully_qualified_name
-      @fully_qualified_name ||= T.let(@nesting.join("::"), T.nilable(String))
+      @fully_qualified_name ||= @nesting.join("::") #: String?
     end
 
-    sig { returns(T::Array[Symbol]) }
+    #: -> Array[Symbol]
     def locals_for_scope
       locals = []
 
@@ -69,20 +52,10 @@ module RubyLsp
 
     private
 
-    sig do
-      params(nodes: T::Array[T.any(
-        Prism::ClassNode,
-        Prism::ModuleNode,
-        Prism::SingletonClassNode,
-        Prism::DefNode,
-        Prism::BlockNode,
-        Prism::LambdaNode,
-        Prism::ProgramNode,
-      )]).returns([T::Array[String], T.nilable(String)])
-    end
+    #: (Array[(Prism::ClassNode | Prism::ModuleNode | Prism::SingletonClassNode | Prism::DefNode | Prism::BlockNode | Prism::LambdaNode | Prism::ProgramNode)] nodes) -> [Array[String], String?]
     def handle_nesting_nodes(nodes)
       nesting = []
-      surrounding_method = T.let(nil, T.nilable(String))
+      surrounding_method = nil #: String?
 
       @nesting_nodes.each do |node|
         case node

data/lib/ruby_lsp/rbs_document.rb

@@ -3,18 +3,18 @@
 
 module RubyLsp
   class RBSDocument < Document
-    extend T::Sig
     extend T::Generic
 
     ParseResultType = type_member { { fixed: T::Array[RBS::AST::Declarations::Base] } }
 
-    sig { params(source: String, version: Integer, uri: URI::Generic, global_state: GlobalState).void }
+    #: (source: String, version: Integer, uri: URI::Generic, global_state: GlobalState) -> void
     def initialize(source:, version:, uri:, global_state:)
-      @syntax_error = T.let(false, T::Boolean)
+      @syntax_error = false #: bool
       super
     end
 
-    sig { override.returns(T::Boolean) }
+    # @override
+    #: -> bool
     def parse!
       return false unless @needs_parsing
 
@@ -29,12 +29,14 @@ module RubyLsp
       true
     end
 
-    sig { override.returns(T::Boolean) }
+    # @override
+    #: -> bool
     def syntax_error?
       @syntax_error
     end
 
-    sig { override.returns(LanguageId) }
+    # @override
+    #: -> LanguageId
     def language_id
       LanguageId::RBS
     end

data/lib/ruby_lsp/requests/code_action_resolve.rb

@@ -7,7 +7,6 @@ module RubyLsp
     # request is used to to resolve the edit field for a given code action, if it is not already provided in the
     # textDocument/codeAction response. We can use it for scenarios that require more computation such as refactoring.
     class CodeActionResolve < Request
-      extend T::Sig
       include Support::Common
 
       NEW_VARIABLE_NAME = "new_variable"
@@ -23,7 +22,7 @@ module RubyLsp
         end
       end
 
-      sig { params(document: RubyDocument, global_state: GlobalState, code_action: T::Hash[Symbol, T.untyped]).void }
+      #: (RubyDocument document, GlobalState global_state, Hash[Symbol, untyped] code_action) -> void
       def initialize(document, global_state, code_action)
         super()
         @document = document
@@ -31,7 +30,8 @@ module RubyLsp
         @code_action = code_action
       end
 
-      sig { override.returns(T.any(Interface::CodeAction, Error)) }
+      # @override
+      #: -> (Interface::CodeAction | Error)
       def perform
         return Error::EmptySelection if @document.source.empty?
 
@@ -53,7 +53,7 @@ module RubyLsp
 
       private
 
-      sig { returns(T.any(Interface::CodeAction, Error)) }
+      #: -> (Interface::CodeAction | Error)
       def switch_block_style
         source_range = @code_action.dig(:data, :range)
         return Error::EmptySelection if source_range[:start] == source_range[:end]
@@ -91,7 +91,7 @@ module RubyLsp
         )
       end
 
-      sig { returns(T.any(Interface::CodeAction, Error)) }
+      #: -> (Interface::CodeAction | Error)
       def refactor_variable
         source_range = @code_action.dig(:data, :range)
         return Error::EmptySelection if source_range[:start] == source_range[:end]
@@ -189,7 +189,7 @@ module RubyLsp
         )
       end
 
-      sig { returns(T.any(Interface::CodeAction, Error)) }
+      #: -> (Interface::CodeAction | Error)
       def refactor_method
         source_range = @code_action.dig(:data, :range)
         return Error::EmptySelection if source_range[:start] == source_range[:end]
@@ -261,7 +261,7 @@ module RubyLsp
         )
       end
 
-      sig { params(range: T::Hash[Symbol, T.untyped], new_text: String).returns(Interface::TextEdit) }
+      #: (Hash[Symbol, untyped] range, String new_text) -> Interface::TextEdit
       def create_text_edit(range, new_text)
         Interface::TextEdit.new(
           range: Interface::Range.new(
@@ -272,7 +272,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::BlockNode, indentation: T.nilable(String)).returns(String) }
+      #: (Prism::BlockNode node, String? indentation) -> String
       def recursively_switch_nested_block_styles(node, indentation)
         parameters = node.parameters
         body = node.body
@@ -301,7 +301,7 @@ module RubyLsp
         source
       end
 
-      sig { params(body: Prism::Node, indentation: T.nilable(String)).returns(String) }
+      #: (Prism::Node body, String? indentation) -> String
       def switch_block_body(body, indentation)
         # Check if there are any nested blocks inside of the current block
         body_loc = body.location
@@ -330,7 +330,7 @@ module RubyLsp
         indentation ? body_content.gsub(";", "\n") : "#{body_content.gsub("\n", ";")} "
       end
 
-      sig { returns(T.any(Interface::CodeAction, Error)) }
+      #: -> (Interface::CodeAction | Error)
       def create_attribute_accessor
         source_range = @code_action.dig(:data, :range)
 

data/lib/ruby_lsp/requests/code_actions.rb

@@ -7,8 +7,6 @@ module RubyLsp
     # request informs the editor of RuboCop quick fixes that can be applied. These are accessible by hovering over a
     # specific diagnostic.
     class CodeActions < Request
-      extend T::Sig
-
       EXTRACT_TO_VARIABLE_TITLE = "Refactor: Extract Variable"
       EXTRACT_TO_METHOD_TITLE = "Refactor: Extract Method"
       TOGGLE_BLOCK_STYLE_TITLE = "Refactor: Toggle block style"
@@ -16,22 +14,17 @@ module RubyLsp
       CREATE_ATTRIBUTE_WRITER = "Create Attribute Writer"
       CREATE_ATTRIBUTE_ACCESSOR = "Create Attribute Accessor"
 
-      INSTANCE_VARIABLE_NODES = T.let(
-        [
-          Prism::InstanceVariableAndWriteNode,
-          Prism::InstanceVariableOperatorWriteNode,
-          Prism::InstanceVariableOrWriteNode,
-          Prism::InstanceVariableReadNode,
-          Prism::InstanceVariableTargetNode,
-          Prism::InstanceVariableWriteNode,
-        ],
-        T::Array[T.class_of(Prism::Node)],
-      )
+      INSTANCE_VARIABLE_NODES = [
+        Prism::InstanceVariableAndWriteNode,
+        Prism::InstanceVariableOperatorWriteNode,
+        Prism::InstanceVariableOrWriteNode,
+        Prism::InstanceVariableReadNode,
+        Prism::InstanceVariableTargetNode,
+        Prism::InstanceVariableWriteNode,
+      ] #: Array[singleton(Prism::Node)]
 
       class << self
-        extend T::Sig
-
-        sig { returns(Interface::CodeActionRegistrationOptions) }
+        #: -> Interface::CodeActionRegistrationOptions
         def provider
           Interface::CodeActionRegistrationOptions.new(
             document_selector: nil,
@@ -40,22 +33,17 @@ module RubyLsp
         end
       end
 
-      sig do
-        params(
-          document: T.any(RubyDocument, ERBDocument),
-          range: T::Hash[Symbol, T.untyped],
-          context: T::Hash[Symbol, T.untyped],
-        ).void
-      end
+      #: ((RubyDocument | ERBDocument) document, Hash[Symbol, untyped] range, Hash[Symbol, untyped] context) -> void
       def initialize(document, range, context)
         super()
         @document = document
-        @uri = T.let(document.uri, URI::Generic)
+        @uri = document.uri #: URI::Generic
         @range = range
         @context = context
       end
 
-      sig { override.returns(T.nilable(T.all(T::Array[Interface::CodeAction], Object))) }
+      # @override
+      #: -> (Array[Interface::CodeAction] & Object)?
       def perform
         diagnostics = @context[:diagnostics]
 
@@ -88,7 +76,7 @@ module RubyLsp
 
       private
 
-      sig { returns(T::Array[Interface::CodeAction]) }
+      #: -> Array[Interface::CodeAction]
       def attribute_actions
         return [] unless @document.is_a?(RubyDocument)
 

data/lib/ruby_lsp/requests/code_lens.rb

@@ -11,29 +11,17 @@ module RubyLsp
     # [code lens](https://microsoft.github.io/language-server-protocol/specification#textDocument_codeLens)
     # request informs the editor of runnable commands such as testing and debugging.
     class CodeLens < Request
-      extend T::Sig
-
       class << self
-        extend T::Sig
-
-        sig { returns(Interface::CodeLensOptions) }
+        #: -> Interface::CodeLensOptions
         def provider
           Interface::CodeLensOptions.new(resolve_provider: false)
         end
       end
 
-      sig do
-        params(
-          global_state: GlobalState,
-          uri: URI::Generic,
-          dispatcher: Prism::Dispatcher,
-        ).void
-      end
+      #: (GlobalState global_state, URI::Generic uri, Prism::Dispatcher dispatcher) -> void
       def initialize(global_state, uri, dispatcher)
-        @response_builder = T.let(
-          ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens].new,
-          ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens],
-        )
+        @response_builder = ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens]
+          .new #: ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens]
         super()
         Listeners::CodeLens.new(@response_builder, global_state, uri, dispatcher)
 
@@ -42,7 +30,8 @@ module RubyLsp
         end
       end
 
-      sig { override.returns(T::Array[Interface::CodeLens]) }
+      # @override
+      #: -> Array[Interface::CodeLens]
       def perform
         @response_builder.response
       end

data/lib/ruby_lsp/requests/completion.rb

@@ -8,12 +8,8 @@ module RubyLsp
     # The [completion](https://microsoft.github.io/language-server-protocol/specification#textDocument_completion)
     # suggests possible completions according to what the developer is typing.
     class Completion < Request
-      extend T::Sig
-
       class << self
-        extend T::Sig
-
-        sig { returns(Interface::CompletionOptions) }
+        #: -> Interface::CompletionOptions
         def provider
           Interface::CompletionOptions.new(
             resolve_provider: true,
@@ -25,18 +21,10 @@ module RubyLsp
         end
       end
 
-      sig do
-        params(
-          document: T.any(RubyDocument, ERBDocument),
-          global_state: GlobalState,
-          params: T::Hash[Symbol, T.untyped],
-          sorbet_level: RubyDocument::SorbetLevel,
-          dispatcher: Prism::Dispatcher,
-        ).void
-      end
+      #: ((RubyDocument | ERBDocument) document, GlobalState global_state, Hash[Symbol, untyped] params, RubyDocument::SorbetLevel sorbet_level, Prism::Dispatcher dispatcher) -> void
       def initialize(document, global_state, params, sorbet_level, dispatcher)
         super()
-        @target = T.let(nil, T.nilable(Prism::Node))
+        @target = nil #: Prism::Node?
         @dispatcher = dispatcher
         # Completion always receives the position immediately after the character that was just typed. Here we adjust it
         # back by 1, so that we find the right node
@@ -72,10 +60,8 @@ module RubyLsp
           ],
           code_units_cache: document.code_units_cache,
         )
-        @response_builder = T.let(
-          ResponseBuilders::CollectionResponseBuilder[Interface::CompletionItem].new,
-          ResponseBuilders::CollectionResponseBuilder[Interface::CompletionItem],
-        )
+        @response_builder = ResponseBuilders::CollectionResponseBuilder[Interface::CompletionItem]
+          .new #: ResponseBuilders::CollectionResponseBuilder[Interface::CompletionItem]
 
         Listeners::Completion.new(
           @response_builder,
@@ -102,7 +88,8 @@ module RubyLsp
         end
       end
 
-      sig { override.returns(T::Array[Interface::CompletionItem]) }
+      # @override
+      #: -> Array[Interface::CompletionItem]
       def perform
         return [] unless @target
 

data/lib/ruby_lsp/requests/completion_resolve.rb

@@ -14,21 +14,21 @@ module RubyLsp
     # At most 10 definitions are included, to ensure low latency during request processing and rendering the completion
     # item.
     class CompletionResolve < Request
-      extend T::Sig
       include Requests::Support::Common
 
       # set a limit on the number of documentation entries returned, to avoid rendering performance issues
       # https://github.com/Shopify/ruby-lsp/pull/1798
       MAX_DOCUMENTATION_ENTRIES = 10
 
-      sig { params(global_state: GlobalState, item: T::Hash[Symbol, T.untyped]).void }
+      #: (GlobalState global_state, Hash[Symbol, untyped] item) -> void
       def initialize(global_state, item)
         super()
-        @index = T.let(global_state.index, RubyIndexer::Index)
+        @index = global_state.index #: RubyIndexer::Index
         @item = item
       end
 
-      sig { override.returns(T::Hash[Symbol, T.untyped]) }
+      # @override
+      #: -> Hash[Symbol, untyped]
       def perform
         return @item if @item.dig(:data, :skip_resolve)
 
@@ -78,7 +78,7 @@ module RubyLsp
 
       private
 
-      sig { params(item: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+      #: (Hash[Symbol, untyped] item) -> Hash[Symbol, untyped]
       def keyword_resolve(item)
         keyword = item[:label]
         content = KEYWORD_DOCS[keyword]