Merge pull request ruby#2413 from ruby/bump-version

Bump to v0.23.0
jruby · Feb 14, 2024 · 24aae7a · 24aae7a
2 parents cf0369a + 523db26
commit 24aae7a
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,28 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.23.0] - 2024-02-14
+
+### Added
+
+- More support for `Prism::RipperCompat` is added.
+- A significantly faster offset cache for `Prism::Translation::Parser` is added for files with multibyte characters.
+- `Prism::Translation::RubyParser` is added.
+- `Prism::ConstantPathTarget#full_name` is added.
+- `version: "3.4.0"` is added as an option that is an alias for `version: "latest"`.
+- Four new APIs are added to `Prism::Location`:
+  - `Prism::Location#start_code_units_offset`
+  - `Prism::Location#end_code_units_offset`
+  - `Prism::Location#start_code_units_column`
+  - `Prism::Location#end_code_units_column`
+- Invalid multibyte characters are now validated within strings, lists, and heredocs.
+
+### Changed
+
+- When defining `def !@`, the `name_loc` was previously only pointing to `!`, but now includes the `@`. The `name` is the same.
+- `Prism::RipperCompat` has been moved to `Prism::Translation::Ripper`.
+- Many of the error messages that prism produces have been changed to match the error messages that CRuby produces.
+
 ## [0.22.0] - 2024-02-07
 
 ### Added
@@ -356,7 +378,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/v0.22.0...HEAD
+[unreleased]: https://github.com/ruby/prism/compare/v0.23.0...HEAD
+[0.23.0]: https://github.com/ruby/prism/compare/v0.22.0...v0.23.0
 [0.22.0]: https://github.com/ruby/prism/compare/v0.21.0...v0.22.0
 [0.21.0]: https://github.com/ruby/prism/compare/v0.20.0...v0.21.0
 [0.20.0]: https://github.com/ruby/prism/compare/v0.19.0...v0.20.0

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prism (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/docs/releasing.md b/docs/releasing.md
@@ -23,17 +23,18 @@ ruby -pi -e 'gsub(/PRISM_VERSION_PATCH \d+/, %Q{PRISM_VERSION_PATCH #{ENV["PRISM
 ruby -pi -e 'gsub(/PRISM_VERSION ".+?"/, %Q{PRISM_VERSION "#{ENV["PRISM_VERSION"]}"})' include/prism/version.h
 ruby -pi -e 'gsub(/"version": ".+?"/, %Q{"version": "#{ENV["PRISM_VERSION"]}"})' javascript/package.json
 ruby -pi -e 'gsub(/lossy\(\), ".+?"/, %Q{lossy(), "#{ENV["PRISM_VERSION"]}"})' rust/ruby-prism-sys/tests/utils_tests.rs
-ruby -pi -e 'gsub(/\d+, "prism major"/, %Q{#{ENV["PRISM_MAJOR"]}, "prism major"})' templates/java/org/prism/Loader.java.erb
-ruby -pi -e 'gsub(/\d+, "prism minor"/, %Q{#{ENV["PRISM_MINOR"]}, "prism minor"})' templates/java/org/prism/Loader.java.erb
-ruby -pi -e 'gsub(/\d+, "prism patch"/, %Q{#{ENV["PRISM_PATCH"]}, "prism patch"})' templates/java/org/prism/Loader.java.erb
+ruby -pi -e 'gsub(/\d+, "prism major/, %Q{#{ENV["PRISM_MAJOR"]}, "prism major})' templates/java/org/prism/Loader.java.erb
+ruby -pi -e 'gsub(/\d+, "prism minor/, %Q{#{ENV["PRISM_MINOR"]}, "prism minor})' templates/java/org/prism/Loader.java.erb
+ruby -pi -e 'gsub(/\d+, "prism patch/, %Q{#{ENV["PRISM_PATCH"]}, "prism patch})' templates/java/org/prism/Loader.java.erb
 ruby -pi -e 'gsub(/MAJOR_VERSION = \d+/, %Q{MAJOR_VERSION = #{ENV["PRISM_MAJOR"]}})' templates/javascript/src/deserialize.js.erb
 ruby -pi -e 'gsub(/MINOR_VERSION = \d+/, %Q{MINOR_VERSION = #{ENV["PRISM_MINOR"]}})' templates/javascript/src/deserialize.js.erb
 ruby -pi -e 'gsub(/PATCH_VERSION = \d+/, %Q{PATCH_VERSION = #{ENV["PRISM_PATCH"]}})' templates/javascript/src/deserialize.js.erb
 ruby -pi -e 'gsub(/MAJOR_VERSION = \d+/, %Q{MAJOR_VERSION = #{ENV["PRISM_MAJOR"]}})' templates/lib/prism/serialize.rb.erb
 ruby -pi -e 'gsub(/MINOR_VERSION = \d+/, %Q{MINOR_VERSION = #{ENV["PRISM_MINOR"]}})' templates/lib/prism/serialize.rb.erb
 ruby -pi -e 'gsub(/PATCH_VERSION = \d+/, %Q{PATCH_VERSION = #{ENV["PRISM_PATCH"]}})' templates/lib/prism/serialize.rb.erb
-ruby -pi -e 'gsub(/version = ".+?"/, %Q{version = "#{ENV["PRISM_VERSION"]}"})' rust/ruby-prism-sys/Cargo.toml
-ruby -pi -e 'gsub(/version = ".+?"/, %Q{version = "#{ENV["PRISM_VERSION"]}"})' rust/ruby-prism/Cargo.toml
+ruby -pi -e 'gsub(/^version = ".+?"/, %Q{version = "#{ENV["PRISM_VERSION"]}"})' rust/ruby-prism-sys/Cargo.toml
+ruby -pi -e 'gsub(/^version = ".+?"/, %Q{version = "#{ENV["PRISM_VERSION"]}"})' rust/ruby-prism/Cargo.toml
+ruby -pi -e 'gsub(/^ruby-prism-sys = { version = ".+?"/, %Q{ruby-prism-sys = { version = "#{ENV["PRISM_VERSION"]}"})' rust/ruby-prism/Cargo.toml
 ```
 
 * Update the `Gemfile.lock` file:

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 "0.22.0"
+#define EXPECTED_PRISM_VERSION "0.23.0"
 
 #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 (0.22.0)
+    prism (0.23.0)
 
 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 (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/3.1/Gemfile.lock b/gemfiles/3.1/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/3.2/Gemfile.lock b/gemfiles/3.2/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/3.3/Gemfile.lock b/gemfiles/3.3/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/3.4/Gemfile.lock b/gemfiles/3.4/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/jruby/Gemfile.lock b/gemfiles/jruby/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/truffleruby/Gemfile.lock b/gemfiles/truffleruby/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    prism (0.22.0)
+    prism (0.23.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/include/prism/version.h b/include/prism/version.h
@@ -14,7 +14,7 @@
 /**
  * The minor version of the Prism library as an int.
  */
-#define PRISM_VERSION_MINOR 22
+#define PRISM_VERSION_MINOR 23
 
 /**
  * The patch version of the Prism library as an int.
@@ -24,6 +24,6 @@
 /**
  * The version of the Prism library as a constant string.
  */
-#define PRISM_VERSION "0.22.0"
+#define PRISM_VERSION "0.23.0"
 
 #endif
diff --git a/javascript/package.json b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ruby/prism",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "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 = "0.22.0"
+  spec.version = "0.23.0"
   spec.authors = ["Shopify"]
   spec.email = ["[email protected]"]
 

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
@@ -1,6 +1,6 @@
 [package]
 name = "ruby-prism-sys"
-version = "0.22.0"
+version = "0.23.0"
 edition = "2021"
 license-file = "../../LICENSE.md"
 repository = "https://github.com/ruby/prism"

diff --git a/rust/ruby-prism-sys/tests/utils_tests.rs b/rust/ruby-prism-sys/tests/utils_tests.rs
@@ -12,7 +12,7 @@ fn version_test() {
         CStr::from_ptr(version)
     };
 
-    assert_eq!(&cstring.to_string_lossy(), "0.22.0");
+    assert_eq!(&cstring.to_string_lossy(), "0.23.0");
 }
 
 #[test]

diff --git a/rust/ruby-prism/Cargo.toml b/rust/ruby-prism/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruby-prism"
-version = "0.22.0"
+version = "0.23.0"
 edition = "2021"
 license-file = "../../LICENSE.md"
 repository = "https://github.com/ruby/prism"
@@ -26,7 +26,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 
 [dependencies]
-ruby-prism-sys = { version = "0.22.0", path = "../ruby-prism-sys" }
+ruby-prism-sys = { version = "0.23.0", path = "../ruby-prism-sys" }
 
 [features]
 default = ["vendored"]

diff --git a/templates/java/org/prism/Loader.java.erb b/templates/java/org/prism/Loader.java.erb
@@ -98,7 +98,7 @@ public class Loader {
         expect((byte) 'M', "incorrect prism header");
 
         expect((byte) 0, "prism major version does not match");
-        expect((byte) 22, "prism minor version does not match");
+        expect((byte) 23, "prism minor version does not match");
         expect((byte) 0, "prism patch version does not match");
 
         expect((byte) 1, "Loader.java requires no location fields in the serialized output");

diff --git a/templates/javascript/src/deserialize.js.erb b/templates/javascript/src/deserialize.js.erb
@@ -1,7 +1,7 @@
 import * as nodes from "./nodes.js";
 
 const MAJOR_VERSION = 0;
-const MINOR_VERSION = 22;
+const MINOR_VERSION = 23;
 const PATCH_VERSION = 0;
 
 class SerializationBuffer {

diff --git a/templates/lib/prism/serialize.rb.erb b/templates/lib/prism/serialize.rb.erb
@@ -20,7 +20,7 @@ module Prism
 
     # The minor version of prism that we are expecting to find in the serialized
     # strings.
-    MINOR_VERSION = 22
+    MINOR_VERSION = 23
 
     # The patch version of prism that we are expecting to find in the serialized
     # strings.
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ fn version_test() { @@
             CStr::from_ptr(version)
         };
-        assert_eq!(&cstring.to_string_lossy(), "0.22.0");
+        assert_eq!(&cstring.to_string_lossy(), "0.23.0");
     }
     #[test]
@@ Expand Down @@