Skip to content

Commit 0d13ed3

Browse files
authored
Bump ruby-lsp to 0.21 (#49)
1 parent be61028 commit 0d13ed3

File tree

12 files changed

+1860
-1046
lines changed

12 files changed

+1860
-1046
lines changed

Gemfile.lock

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

77
GEM
88
remote: https://rubygems.org/
@@ -17,12 +17,12 @@ GEM
1717
irb (1.14.1)
1818
rdoc (>= 4.0.0)
1919
reline (>= 0.4.2)
20-
json (2.7.2)
20+
json (2.7.5)
2121
language_server-protocol (3.17.0.3)
2222
logger (1.6.1)
2323
netrc (0.11.0)
2424
parallel (1.26.3)
25-
parser (3.3.5.0)
25+
parser (3.3.5.1)
2626
ast (~> 2.4.1)
2727
racc
2828
prism (1.2.0)
@@ -45,7 +45,7 @@ GEM
4545
rspec-core (~> 3.13.0)
4646
rspec-expectations (~> 3.13.0)
4747
rspec-mocks (~> 3.13.0)
48-
rspec-core (3.13.1)
48+
rspec-core (3.13.2)
4949
rspec-support (~> 3.13.0)
5050
rspec-expectations (3.13.3)
5151
diff-lcs (>= 1.2.0, < 2.0)
@@ -54,7 +54,7 @@ GEM
5454
diff-lcs (>= 1.2.0, < 2.0)
5555
rspec-support (~> 3.13.0)
5656
rspec-support (3.13.1)
57-
rubocop (1.67.0)
57+
rubocop (1.68.0)
5858
json (~> 2.3)
5959
language_server-protocol (>= 3.17.0)
6060
parallel (~> 1.10)
@@ -64,28 +64,28 @@ GEM
6464
rubocop-ast (>= 1.32.2, < 2.0)
6565
ruby-progressbar (~> 1.7)
6666
unicode-display_width (>= 2.4.0, < 3.0)
67-
rubocop-ast (1.32.3)
67+
rubocop-ast (1.33.0)
6868
parser (>= 3.3.1.0)
6969
rubocop-rake (0.6.0)
7070
rubocop (~> 1.0)
7171
rubocop-shopify (2.15.1)
7272
rubocop (~> 1.51)
73-
rubocop-sorbet (0.8.6)
73+
rubocop-sorbet (0.8.7)
7474
rubocop (>= 1)
75-
ruby-lsp (0.20.1)
75+
ruby-lsp (0.21.2)
7676
language_server-protocol (~> 3.17.0)
7777
prism (>= 1.2, < 2.0)
7878
rbs (>= 3, < 4)
7979
sorbet-runtime (>= 0.5.10782)
8080
ruby-progressbar (1.13.0)
81-
sorbet (0.5.11604)
82-
sorbet-static (= 0.5.11604)
83-
sorbet-runtime (0.5.11604)
84-
sorbet-static (0.5.11604-universal-darwin)
85-
sorbet-static (0.5.11604-x86_64-linux)
86-
sorbet-static-and-runtime (0.5.11604)
87-
sorbet (= 0.5.11604)
88-
sorbet-runtime (= 0.5.11604)
81+
sorbet (0.5.11633)
82+
sorbet-static (= 0.5.11633)
83+
sorbet-runtime (0.5.11633)
84+
sorbet-static (0.5.11633-universal-darwin)
85+
sorbet-static (0.5.11633-x86_64-linux)
86+
sorbet-static-and-runtime (0.5.11633)
87+
sorbet (= 0.5.11633)
88+
sorbet-runtime (= 0.5.11633)
8989
spoom (1.5.0)
9090
erubi (>= 1.10.0)
9191
prism (>= 0.28.0)

lib/ruby_lsp/ruby_lsp_rspec/addon.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Addon < ::RubyLsp::Addon
1717
sig { override.params(global_state: GlobalState, message_queue: Thread::Queue).void }
1818
def activate(global_state, message_queue)
1919
@index = T.let(global_state.index, T.nilable(RubyIndexer::Index))
20-
global_state.index.register_enhancement(IndexingEnhancement.new)
20+
global_state.index.register_enhancement(IndexingEnhancement.new(global_state.index))
2121
end
2222

2323
sig { override.void }

lib/ruby_lsp/ruby_lsp_rspec/indexing_enhancement.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33

44
module RubyLsp
55
module RSpec
6-
class IndexingEnhancement
6+
class IndexingEnhancement < RubyIndexer::Enhancement
77
extend T::Sig
8-
include RubyIndexer::Enhancement
98

109
sig do
1110
override.params(
12-
index: RubyIndexer::Index,
1311
owner: T.nilable(RubyIndexer::Entry::Namespace),
1412
node: Prism::CallNode,
1513
file_path: String,
@@ -19,7 +17,7 @@ class IndexingEnhancement
1917
),
2018
).void
2119
end
22-
def on_call_node(index, owner, node, file_path, code_units_cache)
20+
def on_call_node_enter(owner, node, file_path, code_units_cache)
2321
return if node.receiver
2422

2523
name = node.name
@@ -45,7 +43,7 @@ def on_call_node(index, owner, node, file_path, code_units_cache)
4543

4644
return unless method_name
4745

48-
index.add(RubyIndexer::Entry::Method.new(
46+
@index.add(RubyIndexer::Entry::Method.new(
4947
method_name,
5048
file_path,
5149
RubyIndexer::Location.from_prism_location(block_node.location, code_units_cache),
@@ -78,7 +76,7 @@ def on_call_node(index, owner, node, file_path, code_units_cache)
7876

7977
return unless method_name
8078

81-
index.add(RubyIndexer::Entry::Method.new(
79+
@index.add(RubyIndexer::Entry::Method.new(
8280
method_name,
8381
file_path,
8482
RubyIndexer::Location.from_prism_location(block_node.location, code_units_cache),

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.20.1"
44+
spec.add_dependency "ruby-lsp", "~> 0.21.0"
4545
end

0 commit comments

Comments
 (0)