ruby-lsp-rspec 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2c9365c60f18ec5838ef6b616a1f19de7b28333ea6816a2a730866239baf7d
-  data.tar.gz: 195bbb73070d07492a8e873e0374b453e025ed496916f9df51e14e1fa808c609
+  metadata.gz: 14dfb45f32aa9c2a4041da7e65a851fb7c78928ec3fe29663092b2511c186ada
+  data.tar.gz: 382982a793771a83e0ac9da31756244eca80750b1f35d7ed146fe01c3168514b
 SHA512:
-  metadata.gz: c77f5457e8100cf08eab07c26607f00bb85683d15d69ccb87f85f09a53000c3ffb973365106a2498ba128055e2451ef58c20f9be7267a2b0daea0e5c2e87465c
-  data.tar.gz: a194c571edb9bc0ae68766a2ad6b30b7e245670bd8be66ef82a8796d329edf6e7a92d021b1321ef53e8f14e1d851917414b35dbdc826c749bf41f42712f08e77
+  metadata.gz: e9404a0138a746c552480bada9b04869a2a3f2935db75a785669a0bbb9c15f5d87f25c3e11b16041f87c5bb432693afc8e960abab05b1b9efd43b040050f090a
+  data.tar.gz: 22abcfadc79d4de2aecca269cce28ec987f64ee20df4afdc94fc334d565bc524ca8afaf384cf6a50481705762653e5633b2a9eff2e3f23f56b91753702354c55

data/lib/ruby_lsp/ruby_lsp_rspec/addon.rb

@@ -5,6 +5,7 @@ require "ruby_lsp/addon"
 require "ruby_lsp/internal"
 
 require_relative "code_lens"
+require_relative "document_symbol"
 
 module RubyLsp
   module RSpec
@@ -20,14 +21,25 @@ module RubyLsp
       # Creates a new CodeLens listener. This method is invoked on every CodeLens request
       sig do
         override.params(
+          response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens],
           uri: URI::Generic,
           emitter: Prism::Dispatcher,
-        ).returns(T.nilable(Listener[T::Array[Interface::CodeLens]]))
+        ).void
       end
-      def create_code_lens_listener(uri, emitter)
+      def create_code_lens_listener(response_builder, uri, emitter)
         return unless uri.to_standardized_path&.end_with?("_test.rb") || uri.to_standardized_path&.end_with?("_spec.rb")
 
-        CodeLens.new(uri, emitter)
+        CodeLens.new(response_builder, uri, emitter)
+      end
+
+      sig do
+        override.params(
+          response_builder: ResponseBuilders::DocumentSymbol,
+          dispatcher: Prism::Dispatcher,
+        ).void
+      end
+      def create_document_symbol_listener(response_builder, dispatcher)
+        DocumentSymbol.new(response_builder, dispatcher)
       end
 
       sig { override.returns(String) }

data/lib/ruby_lsp/ruby_lsp_rspec/code_lens.rb

@@ -3,20 +3,20 @@
 
 module RubyLsp
   module RSpec
-    class CodeLens < ::RubyLsp::Listener
+    class CodeLens
       extend T::Sig
-      extend T::Generic
 
       include ::RubyLsp::Requests::Support::Common
 
-      ResponseType = type_member { { fixed: T::Array[::RubyLsp::Interface::CodeLens] } }
-
-      sig { override.returns(ResponseType) }
-      attr_reader :_response
-
-      sig { params(uri: URI::Generic, dispatcher: Prism::Dispatcher).void }
-      def initialize(uri, dispatcher)
-        @_response = T.let([], ResponseType)
+      sig do
+        params(
+          response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens],
+          uri: URI::Generic,
+          dispatcher: Prism::Dispatcher,
+        ).void
+      end
+      def initialize(response_builder, uri, dispatcher)
+        @response_builder = response_builder
         # Listener is only initialized if uri.to_standardized_path is valid
         @path = T.let(T.must(uri.to_standardized_path), String)
         @group_id = T.let(1, Integer)
@@ -39,8 +39,6 @@ module RubyLsp
           end,
           String,
         )
-
-        super(dispatcher)
       end
 
       sig { params(node: Prism::CallNode).void }
@@ -50,7 +48,7 @@ module RubyLsp
           name = generate_name(node)
           add_test_code_lens(node, name: name, kind: :example)
         when "context", "describe"
-          return if node.receiver && node.receiver&.slice != "RSpec"
+          return unless valid_group?(node)
 
           name = generate_name(node)
           add_test_code_lens(node, name: name, kind: :group)
@@ -64,12 +62,19 @@ module RubyLsp
       def on_call_node_leave(node)
         case node.message
         when "context", "describe"
-          return if node.receiver && node.receiver&.slice != "RSpec"
+          return unless valid_group?(node)
 
           @group_id_stack.pop
         end
       end
 
+      private
+
+      sig { params(node: Prism::CallNode).returns(T::Boolean) }
+      def valid_group?(node)
+        !(node.block.nil? || (node.receiver && node.receiver&.slice != "RSpec"))
+      end
+
       sig { params(node: Prism::CallNode).returns(String) }
       def generate_name(node)
         arguments = node.arguments&.arguments
@@ -92,8 +97,6 @@ module RubyLsp
         end
       end
 
-      private
-
       sig { params(node: Prism::Node, name: String, kind: Symbol).void }
       def add_test_code_lens(node, name:, kind:)
         line_number = node.location.start_line
@@ -114,7 +117,7 @@ module RubyLsp
           },
         ]
 
-        @_response << create_code_lens(
+        @response_builder << create_code_lens(
           node,
           title: "Run",
           command_name: "rubyLsp.runTest",
@@ -122,7 +125,7 @@ module RubyLsp
           data: { type: "test", **grouping_data },
         )
 
-        @_response << create_code_lens(
+        @response_builder << create_code_lens(
           node,
           title: "Run In Terminal",
           command_name: "rubyLsp.runTestInTerminal",
@@ -130,7 +133,7 @@ module RubyLsp
           data: { type: "test_in_terminal", **grouping_data },
         )
 
-        @_response << create_code_lens(
+        @response_builder << create_code_lens(
           node,
           title: "Debug",
           command_name: "rubyLsp.debugTest",

data/lib/ruby_lsp/ruby_lsp_rspec/document_symbol.rb

@@ -0,0 +1,88 @@
+# typed: strict
+# frozen_string_literal: true
+
+module RubyLsp
+  module RSpec
+    class DocumentSymbol
+      extend T::Sig
+
+      include ::RubyLsp::Requests::Support::Common
+
+      sig do
+        params(
+          response_builder: ResponseBuilders::DocumentSymbol,
+          dispatcher: Prism::Dispatcher,
+        ).void
+      end
+      def initialize(response_builder, dispatcher)
+        @response_builder = response_builder
+
+        dispatcher.register(self, :on_call_node_enter, :on_call_node_leave)
+      end
+
+      sig { params(node: Prism::CallNode).void }
+      def on_call_node_enter(node)
+        case node.message
+        when "example", "it", "specify"
+          name = generate_name(node)
+
+          return unless name
+
+          @response_builder.last.children << RubyLsp::Interface::DocumentSymbol.new(
+            name: name,
+            kind: LanguageServer::Protocol::Constant::SymbolKind::METHOD,
+            selection_range: range_from_node(node),
+            range: range_from_node(node),
+          )
+        when "context", "describe"
+          return if node.receiver && node.receiver&.slice != "RSpec"
+
+          name = generate_name(node)
+
+          return unless name
+
+          symbol = RubyLsp::Interface::DocumentSymbol.new(
+            name: name,
+            kind: LanguageServer::Protocol::Constant::SymbolKind::MODULE,
+            selection_range: range_from_node(node),
+            range: range_from_node(node),
+            children: [],
+          )
+
+          @response_builder.last.children << symbol
+          @response_builder.push(symbol)
+        end
+      end
+
+      sig { params(node: Prism::CallNode).void }
+      def on_call_node_leave(node)
+        case node.message
+        when "context", "describe"
+          return if node.receiver && node.receiver&.slice != "RSpec"
+
+          @response_builder.pop
+        end
+      end
+
+      sig { params(node: Prism::CallNode).returns(T.nilable(String)) }
+      def generate_name(node)
+        arguments = node.arguments&.arguments
+
+        return unless arguments
+
+        argument = arguments.first
+
+        case argument
+        when Prism::StringNode
+          argument.content.dump
+        when Prism::CallNode
+          "<#{argument.name}>"
+        when nil
+          nil
+        else
+          argument.slice
+        end
+      end
+    end
+  end
+end

data/lib/ruby_lsp_rspec/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module RSpec
-    VERSION = "0.1.8"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Stan Lo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-02 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 description: RSpec addon for ruby-lsp
 email:
 - stan001212@gmail.com
@@ -41,6 +41,7 @@ files:
 - lib/ruby-lsp-rspec.rb
 - lib/ruby_lsp/ruby_lsp_rspec/addon.rb
 - lib/ruby_lsp/ruby_lsp_rspec/code_lens.rb
+- lib/ruby_lsp/ruby_lsp_rspec/document_symbol.rb
 - lib/ruby_lsp_rspec/version.rb
 homepage: https://github.com/st0012/ruby-lsp-rspec
 licenses:
@@ -64,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: RSpec addon for ruby-lsp