Skip to content

Commit 2193813

Browse files
authored
Merge pull request #5 from st0012/bump-ruby-lsp
Use Prism-based ruby-lsp
2 parents e13e395 + af67a7f commit 2193813

File tree

8 files changed

+40832
-15958
lines changed

8 files changed

+40832
-15958
lines changed

Gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
ruby-lsp-rspec (0.1.3)
5-
ruby-lsp (~> 0.11.0)
5+
ruby-lsp (~> 0.12.0)
66

77
GEM
88
remote: https://rubygems.org/
@@ -26,6 +26,7 @@ GEM
2626
ast (~> 2.4.1)
2727
racc
2828
prettier_print (1.2.1)
29+
prism (0.15.1)
2930
psych (5.1.0)
3031
stringio
3132
racc (1.7.1)
@@ -73,10 +74,10 @@ GEM
7374
rubocop (~> 1.51)
7475
rubocop-sorbet (0.7.4)
7576
rubocop (>= 0.90.0)
76-
ruby-lsp (0.11.1)
77+
ruby-lsp (0.12.0)
7778
language_server-protocol (~> 3.17.0)
79+
prism (>= 0.15.1, < 0.16)
7880
sorbet-runtime (>= 0.5.5685)
79-
yarp (>= 0.12, < 0.13)
8081
ruby-progressbar (1.13.0)
8182
sorbet (0.5.11062)
8283
sorbet-static (= 0.5.11062)
@@ -109,7 +110,7 @@ GEM
109110
yard-sorbet (0.8.1)
110111
sorbet-runtime (>= 0.5)
111112
yard (>= 0.9)
112-
yarp (0.12.0)
113+
yarp (0.13.0)
113114

114115
PLATFORMS
115116
arm64-darwin-22

lib/ruby_lsp/ruby_lsp_rspec/addon.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def deactivate; end
2121
sig do
2222
override.params(
2323
uri: URI::Generic,
24-
emitter: EventEmitter,
24+
emitter: Prism::Dispatcher,
2525
message_queue: Thread::Queue,
2626
).returns(T.nilable(Listener[T::Array[Interface::CodeLens]]))
2727
end

lib/ruby_lsp/ruby_lsp_rspec/code_lens.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ class CodeLens < ::RubyLsp::Listener
1414
sig { override.returns(ResponseType) }
1515
attr_reader :_response
1616

17-
sig { params(uri: URI::Generic, emitter: EventEmitter, message_queue: Thread::Queue).void }
18-
def initialize(uri, emitter, message_queue)
17+
sig { params(uri: URI::Generic, dispatcher: Prism::Dispatcher, message_queue: Thread::Queue).void }
18+
def initialize(uri, dispatcher, message_queue)
1919
@_response = T.let([], ResponseType)
2020
@path = T.let(uri.to_standardized_path, T.nilable(String))
21-
emitter.register(self, :on_call)
21+
dispatcher.register(self, :on_call_node_enter)
2222

2323
@base_command = T.let(
2424
begin
@@ -37,11 +37,11 @@ def initialize(uri, emitter, message_queue)
3737
String,
3838
)
3939

40-
super(emitter, message_queue)
40+
super(dispatcher, message_queue)
4141
end
4242

43-
sig { params(node: YARP::CallNode).void }
44-
def on_call(node)
43+
sig { params(node: Prism::CallNode).void }
44+
def on_call_node_enter(node)
4545
message_value = node.message
4646
if message_value == "it"
4747
name = generate_name(node)
@@ -54,15 +54,15 @@ def on_call(node)
5454
end
5555
end
5656

57-
sig { params(node: YARP::CallNode).returns(String) }
57+
sig { params(node: Prism::CallNode).returns(String) }
5858
def generate_name(node)
5959
if node.arguments
6060
argument = node.arguments.arguments.first
6161

6262
case argument
63-
when YARP::StringNode
63+
when Prism::StringNode
6464
argument.content
65-
when YARP::CallNode
65+
when Prism::CallNode
6666
"<#{argument.name}>"
6767
when nil
6868
""
@@ -76,7 +76,7 @@ def generate_name(node)
7676

7777
private
7878

79-
sig { params(node: YARP::Node, name: String, kind: Symbol).void }
79+
sig { params(node: Prism::Node, name: String, kind: Symbol).void }
8080
def add_test_code_lens(node, name:, kind:)
8181
return unless @path
8282

ruby-lsp-rspec.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ Gem::Specification.new do |spec|
4141
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
4242
spec.require_paths = ["lib"]
4343

44-
spec.add_dependency "ruby-lsp", "~> 0.11.0"
44+
spec.add_dependency "ruby-lsp", "~> 0.12.0"
4545
end

0 commit comments

Comments
 (0)