Skip to content

Commit 421f9db

Browse files
authored
Update for ruby-lsp v0.17 (#395)
1 parent 0c85e7a commit 421f9db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2835
-2290
lines changed

Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PATH
1010
remote: .
1111
specs:
1212
ruby-lsp-rails (0.3.6)
13-
ruby-lsp (>= 0.16.5, < 0.17.0)
13+
ruby-lsp (>= 0.17.0, < 0.18.0)
1414
sorbet-runtime (>= 0.5.9897)
1515

1616
GEM
@@ -154,7 +154,7 @@ GEM
154154
parser (3.3.1.0)
155155
ast (~> 2.4.1)
156156
racc
157-
prism (0.24.0)
157+
prism (0.29.0)
158158
psych (5.1.2)
159159
stringio
160160
public_suffix (5.0.5)
@@ -200,8 +200,8 @@ GEM
200200
zeitwerk (~> 2.6)
201201
rainbow (3.1.1)
202202
rake (13.2.1)
203-
rbi (0.1.10)
204-
prism (>= 0.18.0, < 0.25)
203+
rbi (0.1.13)
204+
prism (>= 0.18.0, < 1.0.0)
205205
sorbet-runtime (>= 0.5.9204)
206206
regexp_parser (2.9.0)
207207
reline (0.5.7)
@@ -230,9 +230,9 @@ GEM
230230
rubocop (~> 1.51)
231231
rubocop-sorbet (0.8.3)
232232
rubocop (>= 0.90.0)
233-
ruby-lsp (0.16.6)
233+
ruby-lsp (0.17.0)
234234
language_server-protocol (~> 3.17.0)
235-
prism (>= 0.23.0, < 0.28)
235+
prism (>= 0.29.0, < 0.30)
236236
sorbet-runtime (>= 0.5.10782)
237237
ruby-progressbar (1.13.0)
238238
ruby2_keywords (0.0.5)

lib/ruby_lsp/ruby_lsp_rails/addon.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ def create_code_lens_listener(response_builder, uri, dispatcher)
5959
sig do
6060
override.params(
6161
response_builder: ResponseBuilders::Hover,
62-
nesting: T::Array[String],
62+
node_context: NodeContext,
6363
dispatcher: Prism::Dispatcher,
6464
).void
6565
end
66-
def create_hover_listener(response_builder, nesting, dispatcher)
67-
Hover.new(@client, response_builder, nesting, T.must(@global_state), dispatcher)
66+
def create_hover_listener(response_builder, node_context, dispatcher)
67+
Hover.new(@client, response_builder, node_context, T.must(@global_state), dispatcher)
6868
end
6969

7070
sig do
@@ -81,13 +81,13 @@ def create_document_symbol_listener(response_builder, dispatcher)
8181
override.params(
8282
response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::Location],
8383
uri: URI::Generic,
84-
nesting: T::Array[String],
84+
node_context: NodeContext,
8585
dispatcher: Prism::Dispatcher,
8686
).void
8787
end
88-
def create_definition_listener(response_builder, uri, nesting, dispatcher)
88+
def create_definition_listener(response_builder, uri, node_context, dispatcher)
8989
index = T.must(@global_state).index
90-
Definition.new(@client, response_builder, nesting, index, dispatcher)
90+
Definition.new(@client, response_builder, node_context, index, dispatcher)
9191
end
9292

9393
sig { params(changes: T::Array[{ uri: String, type: Integer }]).void }

lib/ruby_lsp/ruby_lsp_rails/definition.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class Definition
3535
params(
3636
client: RunnerClient,
3737
response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::Location],
38-
nesting: T::Array[String],
38+
node_context: NodeContext,
3939
index: RubyIndexer::Index,
4040
dispatcher: Prism::Dispatcher,
4141
).void
4242
end
43-
def initialize(client, response_builder, nesting, index, dispatcher)
43+
def initialize(client, response_builder, node_context, index, dispatcher)
4444
@client = client
4545
@response_builder = response_builder
46-
@nesting = nesting
46+
@nesting = T.let(node_context.nesting, T::Array[String])
4747
@index = index
4848

4949
dispatcher.register(self, :on_call_node_enter)

lib/ruby_lsp/ruby_lsp_rails/hover.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ class Hover
2424
params(
2525
client: RunnerClient,
2626
response_builder: ResponseBuilders::Hover,
27-
nesting: T::Array[String],
27+
node_context: NodeContext,
2828
global_state: GlobalState,
2929
dispatcher: Prism::Dispatcher,
3030
).void
3131
end
32-
def initialize(client, response_builder, nesting, global_state, dispatcher)
32+
def initialize(client, response_builder, node_context, global_state, dispatcher)
3333
@client = client
3434
@response_builder = response_builder
35-
@nesting = nesting
35+
@nesting = T.let(node_context.nesting, T::Array[String])
3636
@index = T.let(global_state.index, RubyIndexer::Index)
3737
dispatcher.register(self, :on_constant_path_node_enter, :on_constant_read_node_enter, :on_call_node_enter)
3838
end

ruby-lsp-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
2323
Dir["lib/**/*", "LICENSE.txt", "Rakefile", "README.md"]
2424
end
2525

26-
spec.add_dependency("ruby-lsp", ">= 0.16.5", "< 0.17.0")
26+
spec.add_dependency("ruby-lsp", ">= 0.17.0", "< 0.18.0")
2727
spec.add_dependency("sorbet-runtime", ">= 0.5.9897")
2828
end
Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)