Fix StringMatrix to support surrogate pairs

zio · Jan 12, 2025 · 6d18b71 · 6d18b71
1 parent 3143f99
commit 6d18b71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/zio-json/jvm/src/test/scala/zio/json/internal/StringMatrixSpec.scala b/zio-json/jvm/src/test/scala/zio/json/internal/StringMatrixSpec.scala
@@ -7,7 +7,7 @@ import zio.test._
 object StringMatrixSpec extends ZIOSpecDefault {
   val spec: Spec[Environment, Any] = suite("StringMatrix")(
     test("basic positive succeeds") {
-      val names   = List("a", "b")
+      val names   = List("\uD83D\uDE00" /* a surrogate pair for the grinning face */, "a", "b")
       val aliases = List("c" -> 0, "d" -> 1)
       val asserts =
         names.map(s => matcher(names, aliases, s).contains(s)) ++

diff --git a/zio-json/shared/src/main/scala/zio/json/internal/lexer.scala b/zio-json/shared/src/main/scala/zio/json/internal/lexer.scala
@@ -426,7 +426,7 @@ final class StringMatrix(val xs: Array[String], aliases: Array[(String, Int)] =
       val len       = s.length
       var char: Int = 0
       while (char < len) {
-        m(width * char + string) = s.codePointAt(char)
+        m(width * char + string) = s.charAt(char)
         char += 1
       }
       string += 1