Skip to content

Commit 01dc028

Browse files
authored
Upgrade to Prism v0.19 (#1253)
* Upgrade Prism dependency to v0.19 * Re-generate Prism RBI * Exclude Prism submodule from VS Code search * Fix breaking changes
1 parent 90ee251 commit 01dc028

File tree

7 files changed

+5025
-3838
lines changed

7 files changed

+5025
-3838
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"[ruby]": {
55
"editor.defaultFormatter": "Shopify.ruby-lsp",
66
},
7+
"search.exclude": {
8+
"**/test/fixtures/prism": true
9+
},
710
"cSpell.languageSettings": [
811
{
912
"languageId": "*",

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
ruby-lsp (0.13.1)
55
language_server-protocol (~> 3.17.0)
6-
prism (>= 0.18.0, < 0.19)
6+
prism (>= 0.19.0, < 0.20)
77
sorbet-runtime (>= 0.5.5685)
88

99
GEM
@@ -36,14 +36,14 @@ GEM
3636
ast (~> 2.4.1)
3737
racc
3838
prettier_print (1.2.1)
39-
prism (0.18.0)
39+
prism (0.19.0)
4040
psych (5.1.1.1)
4141
stringio
4242
racc (1.7.3)
4343
rainbow (3.1.1)
4444
rake (13.1.0)
45-
rbi (0.1.5)
46-
prism (>= 0.18.0, < 0.19)
45+
rbi (0.1.6)
46+
prism (>= 0.18.0, < 0.20)
4747
sorbet-runtime (>= 0.5.9204)
4848
rdoc (6.6.1)
4949
psych (>= 4.0.0)

lib/ruby_indexer/lib/ruby_indexer/entry.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def list_params(parameters_node)
247247

248248
rest = parameters_node.rest
249249

250-
if rest
250+
if rest.is_a?(Prism::RestParameterNode)
251251
rest_name = rest.name || RestParameter::DEFAULT_NAME
252252
parameters << RestParameter.new(name: rest_name)
253253
end
@@ -288,6 +288,8 @@ def parameter_name(node)
288288
names << (rest.operator == "*" ? "*#{name}".to_sym : name&.to_sym)
289289
end
290290

291+
names << nil if rest.is_a?(Prism::ImplicitRestNode)
292+
291293
names.concat(node.rights.map { |parameter_node| parameter_name(parameter_node) })
292294

293295
names_with_commas = names.join(", ")

ruby-lsp.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
1818
s.require_paths = ["lib"]
1919

2020
s.add_dependency("language_server-protocol", "~> 3.17.0")
21-
s.add_dependency("prism", ">= 0.18.0", "< 0.19")
21+
s.add_dependency("prism", ">= 0.19.0", "< 0.20")
2222
s.add_dependency("sorbet-runtime", ">= 0.5.5685")
2323

2424
s.required_ruby_version = ">= 3.0"

0 commit comments

Comments
 (0)