Bump to v

kddnewton · kddnewton · commit 7574837b7b42 · 2025-10-09T09:18:12.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.5.2] - 2025-10-09
+
+### Changed
+
+- Fix character literal forced encoding when a unicode escape sequence is used.
+- Reject `1 if foo = bar baz`.
+- Clear static literal flag on interpolated strings.
+- Reject optional argument/endless method definition ambiguity.
+
 ## [1.5.1] - 2025-09-13
 
 ### Changed
@@ -676,7 +685,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby/prism/compare/v1.5.1...HEAD
+[unreleased]: https://github.com/ruby/prism/compare/v1.5.2...HEAD
+[1.5.2]: https://github.com/ruby/prism/compare/v1.5.1...v1.5.2
 [1.5.1]: https://github.com/ruby/prism/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/ruby/prism/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/ruby/prism/compare/v1.3.0...v1.4.0
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
     benchmark-ips (2.14.0)
     date (3.4.1)
-    erb (5.0.2)
+    erb (5.0.3)
     ffi (1.17.2)
     mini_portile2 (2.8.9)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -27,18 +27,20 @@ GEM
     rake (13.3.0)
     rake-compiler (1.3.0)
       rake
-    rdoc (6.14.2)
+    rdoc (6.15.0)
       erb
       psych (>= 4.0.0)
+      tsort
     ruby_memcheck (3.0.1)
       nokogiri
     ruby_parser (3.21.1)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
-    sexp_processor (4.17.3)
+    sexp_processor (4.17.4)
     stringio (3.1.7)
     test-unit (3.7.0)
       power_assert
+    tsort (0.2.0)
 
 PLATFORMS
   ruby
diff --git a/docs/releasing.md b/docs/releasing.md
@@ -47,7 +47,9 @@ bundle install
 * Update the version-specific lockfiles:
 
 ```sh
-bin/prism bundle install
+for VERSION in "2.7" "3.0" "3.1" "3.2" "3.3" "3.4"; do docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/$VERSION/Gemfile" "ruby:$VERSION" bundle update; done
+docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/3.5/Gemfile" ruby:3.5.0-preview1 bundle update
+BUNDLE_GEMFILE=gemfiles/truffleruby/Gemfile chruby-exec truffleruby -- bundle update
 ```
 
 * Update the cargo lockfiles:
diff --git a/ext/prism/extension.h b/ext/prism/extension.h
@@ -1,7 +1,7 @@
 #ifndef PRISM_EXT_NODE_H
 #define PRISM_EXT_NODE_H
 
-#define EXPECTED_PRISM_VERSION "1.5.1"
+#define EXPECTED_PRISM_VERSION "1.5.2"
 
 #include <ruby.h>
 #include <ruby/encoding.h>
diff --git a/gemfiles/2.7/Gemfile.lock b/gemfiles/2.7/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/3.0/Gemfile.lock b/gemfiles/3.0/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/3.1/Gemfile.lock b/gemfiles/3.1/Gemfile.lock
@@ -1,15 +1,15 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
diff --git a/gemfiles/3.2/Gemfile.lock b/gemfiles/3.2/Gemfile.lock
@@ -1,15 +1,15 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
diff --git a/gemfiles/3.3/Gemfile.lock b/gemfiles/3.3/Gemfile.lock
@@ -1,15 +1,15 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -50,4 +50,4 @@ RUBY VERSION
    ruby 3.3.0p0
 
 BUNDLED WITH
-   2.5.16
+   2.5.22
diff --git a/gemfiles/3.4/Gemfile.lock b/gemfiles/3.4/Gemfile.lock
@@ -1,15 +1,15 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
@@ -50,4 +50,4 @@ RUBY VERSION
    ruby 3.4.1p0
 
 BUNDLED WITH
-   2.6.2
+   2.6.9
diff --git a/gemfiles/3.5/Gemfile.lock b/gemfiles/3.5/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -10,7 +10,7 @@ GEM
     ffi (1.17.2)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     onigmo (0.1.0)
diff --git a/gemfiles/jruby/Gemfile.lock b/gemfiles/jruby/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -44,4 +44,4 @@ RUBY VERSION
    ruby 3.4.2p0 (jruby 10.0.0.0)
 
 BUNDLED WITH
-   2.6.3
+   2.7.2
diff --git a/gemfiles/truffleruby/Gemfile.lock b/gemfiles/truffleruby/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (1.5.1)
+    prism (1.5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -37,4 +37,4 @@ RUBY VERSION
    ruby 3.3.7p0 (truffleruby 25.0.0)
 
 BUNDLED WITH
-   2.4.19
+   2.5.22
diff --git a/gemfiles/typecheck/Gemfile.lock b/gemfiles/typecheck/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -15,34 +15,34 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
     ast (2.4.3)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.3.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    csv (3.3.3)
-    drb (2.2.1)
+    connection_pool (2.5.4)
+    csv (3.3.5)
+    drb (2.2.3)
     erubi (1.13.1)
     ffi (1.17.2-arm64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     fileutils (1.7.3)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
+    json (2.15.1)
+    language_server-protocol (3.17.0.5)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    minitest (5.25.5)
+    minitest (5.26.0)
     mutex_m (0.3.0)
     netrc (0.11.0)
-    parallel (1.26.3)
+    parallel (1.27.0)
     parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     power_assert (2.0.5)
-    prism (1.4.0)
+    prism (1.5.1)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
@@ -51,29 +51,30 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbi (0.3.1)
+    rbi (0.3.6)
       prism (~> 1.0)
       rbs (>= 3.4.4)
-      sorbet-runtime (>= 0.5.9204)
     rbs (3.9.5)
       logger
+    rexml (3.4.4)
     ruby_parser (3.21.1)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
     securerandom (0.4.1)
-    sexp_processor (4.17.3)
-    sorbet (0.6.12627)
-      sorbet-static (= 0.6.12627)
-    sorbet-runtime (0.6.12627)
-    sorbet-static (0.6.12627-universal-darwin)
-    sorbet-static (0.6.12627-x86_64-linux)
-    sorbet-static-and-runtime (0.6.12627)
-      sorbet (= 0.6.12627)
-      sorbet-runtime (= 0.6.12627)
-    spoom (1.6.1)
+    sexp_processor (4.17.4)
+    sorbet (0.6.12632)
+      sorbet-static (= 0.6.12632)
+    sorbet-runtime (0.6.12632)
+    sorbet-static (0.6.12632-universal-darwin)
+    sorbet-static (0.6.12632-x86_64-linux)
+    sorbet-static-and-runtime (0.6.12632)
+      sorbet (= 0.6.12632)
+      sorbet-runtime (= 0.6.12632)
+    spoom (1.6.3)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)
-      rbi (>= 0.2.3)
+      rbi (>= 0.3.3)
+      rexml (>= 3.2.6)
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
     steep (1.10.0)
@@ -93,7 +94,7 @@ GEM
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 5)
       uri (>= 0.12.0)
-    strscan (3.1.2)
+    strscan (3.1.5)
     tapioca (0.16.11)
       benchmark
       bundler (>= 2.2.25)
@@ -111,10 +112,10 @@ GEM
     thor (1.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.4)
     yard (0.9.37)
     yard-sorbet (0.9.0)
       sorbet-runtime
diff --git a/include/prism/version.h b/include/prism/version.h
@@ -19,11 +19,11 @@
 /**
  * The patch version of the Prism library as an int.
  */
-#define PRISM_VERSION_PATCH 1
+#define PRISM_VERSION_PATCH 2
 
 /**
  * The version of the Prism library as a constant string.
  */
-#define PRISM_VERSION "1.5.1"
+#define PRISM_VERSION "1.5.2"
 
 #endif
diff --git a/javascript/package.json b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ruby/prism",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Prism Ruby parser",
   "type": "module",
   "main": "src/index.js",
diff --git a/prism.gemspec b/prism.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "prism"
-  spec.version = "1.5.1"
+  spec.version = "1.5.2"
   spec.authors = ["Shopify"]
   spec.email = ["ruby@shopify.com"]
 
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/ruby-prism-sys/Cargo.toml b/rust/ruby-prism-sys/Cargo.toml
diff --git a/rust/ruby-prism-sys/tests/utils_tests.rs b/rust/ruby-prism-sys/tests/utils_tests.rs
diff --git a/rust/ruby-prism/Cargo.toml b/rust/ruby-prism/Cargo.toml
diff --git a/templates/java/org/prism/Loader.java.erb b/templates/java/org/prism/Loader.java.erb
diff --git a/templates/javascript/src/deserialize.js.erb b/templates/javascript/src/deserialize.js.erb
diff --git a/templates/lib/prism/serialize.rb.erb b/templates/lib/prism/serialize.rb.erb
