ruby-lsp-rspec 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70ca8698ce3d421e1e0160e74eaee948a90fcc20f284599749903797af11a8b4
-  data.tar.gz: 32cae6d7a1d8ecc2b3b2d0aeab0f68d4a93cd554e8308a66a538d43f161422e0
+  metadata.gz: abd13dc9d8a0e8606740056b6540c082227a48587cbd6bb13b8592a7c62b09ca
+  data.tar.gz: 22e7f07f29b8129cedb214a8d644d50bf6851d24ba7591f099b5c7184faf52f9
 SHA512:
-  metadata.gz: 6368f975531fcb06413f84470a105b6b38a7979f2f5d69ff80ad760575e3283f329c54eabb31892c0dff8039a23aaae774b61e262e8f34ef0dbe97143633f0a3
-  data.tar.gz: 6e6746eccc7164dfe3efa683cdbef3b7628ab436e9918338bc8707663caa5a03e1598229c38797d699466515cb03b3edd35e64df5ecd9def1ccec30fccf8fe79
+  metadata.gz: 74fc67112efba1457a4bbaebd53f1e0a0a642a0270c83bd065c6d92f49e9bc3e6c3275146efcef15da9d8b720d116589dbc2637dc46c37789a603d822ca1f415
+  data.tar.gz: 2ab1f1fcd7a1ec6f019ff7fe6be9e155c0a3c634a0658920d200d492723ee34f5fac160ac2bf0eac72860169c31e276d5662ec5ef59378b95b013933451af919

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/ruby-lsp-rspec.svg)](https://badge.fury.io/rb/ruby-lsp-rspec)
 
-Ruby LSP RSpec is a [Ruby LSP](https://github.com/Shopify/ruby-lsp) extension for displaying CodeLens for RSpec tests.
+Ruby LSP RSpec is a [Ruby LSP](https://github.com/Shopify/ruby-lsp) addon for displaying CodeLens for RSpec tests.
 
 ![Screenshot of the code lenses](/misc/example.gif)
 

data/lib/ruby-lsp-rspec.rb

@@ -3,7 +3,7 @@
 
 require "sorbet-runtime"
 require "ruby_lsp_rspec/version"
-require "ruby_lsp/ruby_lsp_rspec/extension"
+require "ruby_lsp/ruby_lsp_rspec/addon"
 
 module RubyLsp
   module RSpec

data/lib/ruby_lsp/ruby_lsp_rspec/{extension.rb → addon.rb}

@@ -1,14 +1,14 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "ruby_lsp/extension"
+require "ruby_lsp/addon"
 require "ruby_lsp/internal"
 
 require_relative "code_lens"
 
 module RubyLsp
   module RSpec
-    class Extension < ::RubyLsp::Extension
+    class Addon < ::RubyLsp::Addon
       extend T::Sig
 
       sig { override.void }

data/lib/ruby_lsp/ruby_lsp_rspec/code_lens.rb

@@ -18,7 +18,7 @@ module RubyLsp
       def initialize(uri, emitter, message_queue)
         @_response = T.let([], ResponseType)
         @path = T.let(uri.to_standardized_path, T.nilable(String))
-        emitter.register(self, :on_command, :on_command_call, :on_call)
+        emitter.register(self, :on_call)
 
         @base_command = T.let(
           begin
@@ -40,81 +40,43 @@ module RubyLsp
         super(emitter, message_queue)
       end
 
-      sig { params(node: SyntaxTree::CallNode).void }
+      sig { params(node: YARP::CallNode).void }
       def on_call(node)
-        add_group_code_lens(node)
-      end
-
-      sig { params(node: SyntaxTree::CommandCall).void }
-      def on_command_call(node)
-        add_group_code_lens(node)
-      end
-
-      sig { params(node: SyntaxTree::Command).void }
-      def on_command(node)
-        message_value = node.message.value
+        message_value = node.message
         if message_value == "it"
-          argument = node.arguments.parts.first
-
-          name = case argument
-          when SyntaxTree::StringLiteral
-            argument.parts.first.value
-          when SyntaxTree::VarRef
-            argument.value.value
-          end
-
+          name = generate_name(node)
           add_test_code_lens(node, name: name, kind: :example)
         elsif message_value == "describe" || message_value == "context"
-          add_group_code_lens(node)
-        end
-      end
-
-      private
+          return if node.receiver && node.receiver.name.to_s != "RSpec"
 
-      sig do
-        params(node: T.any(
-          SyntaxTree::StringLiteral,
-          SyntaxTree::ConstPathRef,
-          SyntaxTree::ConstRef,
-          SyntaxTree::TopConstRef,
-          SyntaxTree::VarRef,
-        )).returns(T.nilable(String))
-      end
-      def get_group_name(node)
-        case node
-        when SyntaxTree::StringLiteral
-          node.parts.first.value
-        when SyntaxTree::ConstPathRef, SyntaxTree::ConstRef, SyntaxTree::TopConstRef
-          full_constant_name(node)
-        when SyntaxTree::VarRef
-          node.value.value
+          name = generate_name(node)
+          add_test_code_lens(node, name: name, kind: :group)
         end
       end
 
-      sig { params(node: T.any(SyntaxTree::CallNode, SyntaxTree::CommandCall, SyntaxTree::Command)).void }
-      def add_group_code_lens(node)
-        return unless node.message.value == "describe" || node.message.value == "context"
-
-        case node
-        when SyntaxTree::CommandCall, SyntaxTree::CallNode
-          return if node.receiver && node.receiver.value.value != "RSpec"
-        end
-
-        argument = case node
-        when SyntaxTree::CallNode
-          node.arguments.arguments.parts.first
-        when SyntaxTree::CommandCall, SyntaxTree::Command
-          node.arguments.parts.first
+      sig { params(node: YARP::CallNode).returns(String) }
+      def generate_name(node)
+        if node.arguments
+          argument = node.arguments.arguments.first
+
+          case argument
+          when YARP::StringNode
+            argument.content
+          when YARP::CallNode
+            "<#{argument.name}>"
+          when nil
+            ""
+          else
+            argument.slice
+          end
+        else
+          "<unnamed>"
         end
-
-        name = get_group_name(argument)
-
-        return unless name
-
-        add_test_code_lens(node, name: name, kind: :group)
       end
 
-      sig { params(node: SyntaxTree::Node, name: String, kind: Symbol).void }
+      private
+
+      sig { params(node: YARP::Node, name: String, kind: Symbol).void }
       def add_test_code_lens(node, name:, kind:)
         return unless @path
 

data/lib/ruby_lsp_rspec/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module RSpec
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stan Lo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
@@ -16,15 +16,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
-description: RSpec extension for ruby-lsp
+        version: 0.11.0
+description: RSpec addon for ruby-lsp
 email:
 - stan001212@gmail.com
 executables: []
@@ -39,8 +39,8 @@ files:
 - README.md
 - Rakefile
 - 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/extension.rb
 - lib/ruby_lsp_rspec/version.rb
 homepage: https://github.com/st0012/ruby-lsp-rspec
 licenses:
@@ -67,5 +67,5 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: RSpec extension for ruby-lsp
+summary: RSpec addon for ruby-lsp
 test_files: []