Skip to content

fix: std.manifestToml passes through Unicode characters natively #1018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenamar-db merged 2 commits into from
Jun 24, 2026
+15 −3
Merged

fix: std.manifestToml passes through Unicode characters natively #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b8688d
fix: std.manifestToml passes through Unicode characters natively
He-Pin Jun 24, 2026
d12bb7b
test: add TOML Unicode native output regression test (golden from C++…
He-Pin Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sjsonnet/src/sjsonnet/TomlRenderer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class TomlRenderer(
if (s == null) {
visitNull(index)
} else {
BaseRenderer.escape(out, s, unicode = true)
BaseRenderer.escape(out, s, unicode = false)
flush
}
}
Expand Down Expand Up @@ -161,7 +161,7 @@ object TomlRenderer {

def writeEscapedKey(out: StringBuilderWriter, key: CharSequence): Unit = {
if (isBareKey(key)) out.write(key.toString)
else BaseRenderer.escape(out, key, unicode = true)
else BaseRenderer.escape(out, key, unicode = false)
}

def escapeKey(key: String): String = if (isBareKey(key)) key
Expand Down
11 changes: 11 additions & 0 deletions sjsonnet/test/resources/new_test_suite/toml_unicode_native_output.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Regression test: TOML output must pass through Unicode natively.
// Golden verified against cpp-jsonnet 0.21.0, go-jsonnet 0.22.0, jrsonnet 0.5.0-pre99.
std.assertEqual(
std.manifestToml({name: "世界", drink: "café", emoji: "🌍"}),
"drink = \"café\"\nemoji = \"🌍\"\nname = \"世界\""
) &&
std.assertEqual(
std.manifestToml({section: {key: "日本語"}}),
"\n\n[section]\n key = \"日本語\""
) &&
true
1 change: 1 addition & 0 deletions sjsonnet/test/resources/new_test_suite/toml_unicode_native_output.jsonnet.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
true
2 changes: 1 addition & 1 deletion sjsonnet/test/src/sjsonnet/UnicodeHandlingTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ object UnicodeHandlingTests extends TestSuite {

// TOML manifest:
eval(s"std.manifestTomlEx($testObject, ' ')") ==>
ujson.Str("a = 1\nz = 2\n\"\\uffff\" = 3\n\"\\ud800\\udc00\" = 4")
ujson.Str("a = 1\nz = 2\n\"\uFFFF\" = 3\n\"\uD800\uDC00\" = 4")
}

test("findSubstr") {
Expand Down
Loading