Skip to content

Commit d19fcef

Browse files
committed
Upgrade ruby-lsp requirement to v0.19
1 parent 05b3d69 commit d19fcef

File tree

5 files changed

+643
-323
lines changed

5 files changed

+643
-323
lines changed

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
ruby-lsp-rails (0.3.16)
5-
ruby-lsp (>= 0.18.4, < 0.19.0)
5+
ruby-lsp (>= 0.19.0, < 0.20.0)
66

77
GEM
88
remote: https://rubygems.org/
@@ -148,7 +148,7 @@ GEM
148148
parser (3.3.1.0)
149149
ast (~> 2.4.1)
150150
racc
151-
prism (1.0.0)
151+
prism (1.1.0)
152152
psych (5.1.2)
153153
stringio
154154
public_suffix (5.0.5)
@@ -227,9 +227,9 @@ GEM
227227
rubocop (~> 1.51)
228228
rubocop-sorbet (0.8.3)
229229
rubocop (>= 0.90.0)
230-
ruby-lsp (0.18.4)
230+
ruby-lsp (0.19.0)
231231
language_server-protocol (~> 3.17.0)
232-
prism (~> 1.0)
232+
prism (>= 1.1, < 2.0)
233233
rbs (>= 3, < 4)
234234
sorbet-runtime (>= 0.5.10782)
235235
ruby-progressbar (1.13.0)

lib/ruby_lsp/ruby_lsp_rails/addon.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def rails_runner_client
4848
sig { override.params(global_state: GlobalState, message_queue: Thread::Queue).void }
4949
def activate(global_state, message_queue)
5050
@global_state = global_state
51-
$stderr.puts("Activating Ruby LSP Rails add-on v#{VERSION}")
51+
$stderr.puts("Activating Ruby LSP Rails add-on v#{version}")
5252
register_additional_file_watchers(global_state: global_state, message_queue: message_queue)
5353
@global_state.index.register_enhancement(IndexingEnhancement.new)
5454

@@ -61,6 +61,11 @@ def deactivate
6161
@rails_runner_client.shutdown
6262
end
6363

64+
sig { override.returns(String) }
65+
def version
66+
VERSION
67+
end
68+
6469
# Creates a new CodeLens listener. This method is invoked on every CodeLens request
6570
sig do
6671
override.params(

lib/ruby_lsp/ruby_lsp_rails/indexing_enhancement.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ def handle_association(index, owner, node, file_path)
6060
name_arg.location,
6161
name_arg.location,
6262
nil,
63+
index.configuration.encoding,
6364
[RubyIndexer::Entry::Signature.new([])],
6465
RubyIndexer::Entry::Visibility::PUBLIC,
6566
owner,
@@ -72,6 +73,7 @@ def handle_association(index, owner, node, file_path)
7273
name_arg.location,
7374
name_arg.location,
7475
nil,
76+
index.configuration.encoding,
7577
[RubyIndexer::Entry::Signature.new([RubyIndexer::Entry::RequiredParameter.new(name: name.to_sym)])],
7678
RubyIndexer::Entry::Visibility::PUBLIC,
7779
owner,

ruby-lsp-rails.gemspec

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

27-
spec.add_dependency("ruby-lsp", ">= 0.18.4", "< 0.19.0")
27+
spec.add_dependency("ruby-lsp", ">= 0.19.0", "< 0.20.0")
2828
end

0 commit comments

Comments
 (0)