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
Shopify · Dec 15, 2023 · 01dc028 · 01dc028
1 parent 90ee251
commit 01dc028
Show file tree

Hide file tree

Showing 7 changed files with 5,025 additions and 3,838 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,9 @@
   "[ruby]": {
     "editor.defaultFormatter": "Shopify.ruby-lsp",
   },
+  "search.exclude": {
+    "**/test/fixtures/prism": true
+  },
   "cSpell.languageSettings": [
     {
       "languageId": "*",

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     ruby-lsp (0.13.1)
       language_server-protocol (~> 3.17.0)
-      prism (>= 0.18.0, < 0.19)
+      prism (>= 0.19.0, < 0.20)
       sorbet-runtime (>= 0.5.5685)
 
 GEM
@@ -36,14 +36,14 @@ GEM
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    prism (0.18.0)
+    prism (0.19.0)
     psych (5.1.1.1)
       stringio
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
-    rbi (0.1.5)
-      prism (>= 0.18.0, < 0.19)
+    rbi (0.1.6)
+      prism (>= 0.18.0, < 0.20)
       sorbet-runtime (>= 0.5.9204)
     rdoc (6.6.1)
       psych (>= 4.0.0)

diff --git a/lib/ruby_indexer/lib/ruby_indexer/entry.rb b/lib/ruby_indexer/lib/ruby_indexer/entry.rb
@@ -247,7 +247,7 @@ def list_params(parameters_node)
 
         rest = parameters_node.rest
 
-        if rest
+        if rest.is_a?(Prism::RestParameterNode)
           rest_name = rest.name || RestParameter::DEFAULT_NAME
           parameters << RestParameter.new(name: rest_name)
         end
@@ -288,6 +288,8 @@ def parameter_name(node)
             names << (rest.operator == "*" ? "*#{name}".to_sym : name&.to_sym)
           end
 
+          names << nil if rest.is_a?(Prism::ImplicitRestNode)
+
           names.concat(node.rights.map { |parameter_node| parameter_name(parameter_node) })
 
           names_with_commas = names.join(", ")

diff --git a/ruby-lsp.gemspec b/ruby-lsp.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("language_server-protocol", "~> 3.17.0")
-  s.add_dependency("prism", ">= 0.18.0", "< 0.19")
+  s.add_dependency("prism", ">= 0.19.0", "< 0.20")
   s.add_dependency("sorbet-runtime", ">= 0.5.5685")
 
   s.required_ruby_version = ">= 3.0"