Merge pull request #485 from cynkra/b-481-encoding

fix encoding issue
cynkra · Sep 19, 2024 · e15055a · e15055a
2 parents 7402060 + bff5e5c
commit e15055a
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 210 deletions.
diff --git a/R/character-helpers.R b/R/character-helpers.R
@@ -31,7 +31,7 @@ construct_string <- function(x, unicode_representation, escape, mode = "string",
 
   encoding <- Encoding(x)
   locale_is_utf8 <- l10n_info()$`UTF-8`
-  if (!locale_is_utf8) {
+  if (encoding == "latin1" || !locale_is_utf8) {
     return(construct_string_from_byte_value(x, encoding, mode, protect))
   }
 

diff --git a/tests/testthat/_snaps/encoding.md b/tests/testthat/_snaps/encoding.md
@@ -9,3 +9,22 @@
         y = "loooooooooooooooooooooooooooooooooong_enough_for_multiline_output"
       )
 
+# non UTF-8 encodings with UTF-8 system
+
+    Code
+      x <- iconv("hello world", to = "latin1")
+      construct(x)
+    Output
+      "hello\xa0world" |> (`Encoding<-`)("latin1")
+    Code
+      x <- iconv("こんにちは", to = "shift_jis")
+      construct(x)
+    Output
+      "\x82\xb1\x82\xf1\x82\xc9\x82\xbf\x82\xcd"
+    Code
+      x <- "hello world"
+      Encoding(x) <- "latin1"
+      construct(x)
+    Output
+      "hello\xc2\xa0world" |> (`Encoding<-`)("latin1")
+
diff --git a/tests/testthat/_snaps/s3-R6.new.md b/tests/testthat/_snaps/s3-R6.new.md
diff --git a/tests/testthat/_snaps/s3-R6ClassGenerator.new.md b/tests/testthat/_snaps/s3-R6ClassGenerator.new.md
diff --git a/tests/testthat/test-encoding.R b/tests/testthat/test-encoding.R
@@ -6,3 +6,16 @@ test_that("Encoding", {
     ))
   )
 })
+
+test_that("non UTF-8 encodings with UTF-8 system", {
+  skip_if(!l10n_info()$`UTF-8`)
+  expect_snapshot({
+    x <- iconv("hello\U{A0}world", to = "latin1")
+    construct(x)
+    x <- iconv("こんにちは", to = "shift_jis")
+    construct(x)
+    x <- "hello\U{A0}world"
+    Encoding(x) <- "latin1"
+    construct(x)
+  })
+})