From 33aaa069a4e7b405e6d7ec5fcbf04a487e36e345 Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Tue, 18 Mar 2025 10:51:45 -0400
Subject: [PATCH] [ruby/prism] Update truffleruby version

https://github.com/ruby/prism/commit/2afe89f8ce
---
 test/prism/ruby/parameters_signature_test.rb | 7 ++++---
 test/prism/ruby/ripper_test.rb               | 2 +-
 tool/bundler/rubocop_gems.rb                 | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/prism/ruby/parameters_signature_test.rb b/test/prism/ruby/parameters_signature_test.rb
index 9256bcc070..af5b54ed91 100644
--- a/test/prism/ruby/parameters_signature_test.rb
+++ b/test/prism/ruby/parameters_signature_test.rb
@@ -54,9 +54,10 @@ module Prism
       assert_parameters([[:keyrest, :**]], "**")
     end
 
-    def test_key_ordering
-      omit("TruffleRuby returns keys in order they were declared") if RUBY_ENGINE == "truffleruby"
-      assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
+    if RUBY_ENGINE != "truffleruby"
+      def test_key_ordering
+        assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
+      end
     end
 
     def test_block
diff --git a/test/prism/ruby/ripper_test.rb b/test/prism/ruby/ripper_test.rb
index 4afe377038..d4b278c28e 100644
--- a/test/prism/ruby/ripper_test.rb
+++ b/test/prism/ruby/ripper_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-return if RUBY_VERSION < "3.3"
+return if RUBY_VERSION < "3.3" || RUBY_ENGINE == "truffleruby"
 
 require_relative "../test_helper"
 
diff --git a/tool/bundler/rubocop_gems.rb b/tool/bundler/rubocop_gems.rb
index ab13b1b2c3..53dd52dbb4 100644
--- a/tool/bundler/rubocop_gems.rb
+++ b/tool/bundler/rubocop_gems.rb
@@ -2,7 +2,11 @@
 
 source "https://rubygems.org"
 
+<<<<<<< HEAD:tool/bundler/rubocop_gems.rb
 gem "rubocop", ">= 1.52.1", "< 2"
+=======
+ruby "~> 3.3.5", engine: "truffleruby", engine_version: "~> 24.2.0"
+>>>>>>> 2afe89f8ce (Update truffleruby version):gemfiles/truffleruby/Gemfile
 
 gem "minitest"
 gem "irb"