Fix handling of newlines when converting quotes

Author: krlmlr

NAMESPACE

@@ -34,6 +34,7 @@ importFrom(purrr,pwalk)
 importFrom(purrr,reduce)
 importFrom(purrr,when)
 importFrom(rlang,abort)
+importFrom(rlang,is_empty)
 importFrom(rlang,is_installed)
 importFrom(rlang,seq2)
 importFrom(rlang,warn)

R/rules-spacing.R

@@ -126,16 +126,31 @@ remove_space_after_unary_pm_nested <- function(pd) {
 #' '")
 #' @importFrom purrr map map_chr
 #' @param pd_flat A flat parse table.
+#' @importFrom rlang is_empty
 #' @keywords internal
 fix_quotes <- function(pd_flat) {
-  str_const <- pd_flat$token == "STR_CONST"
-  str_const_change <- grepl("^'([^\"]*)'$", pd_flat$text[str_const])
-  pd_flat$text[str_const][str_const_change] <-
-    map(pd_flat$text[str_const][str_const_change], parse_text) %>%
-    map_chr(~ paste0("\"", .x, "\""))
+  str_const <- which(pd_flat$token == "STR_CONST")
+  # Shortcut for performance
+  if (is_empty(str_const)) return(pd_flat)
+
+  pd_flat$text[str_const] <- map(pd_flat$text[str_const], fix_quotes_one)
   pd_flat
 }
 
+#' @importFrom rlang is_empty
+fix_quotes_one <- function(x) {
+  rx <- "^'([^\"]*)'$"
+  i <- grep(rx, x)
+  # Shortcut for performance
+  if (is_empty(i)) return(x)
+
+  xi <- gsub(rx, '"\\1"', x[i])
+
+  # Replace all \' by ' and keep all other instances of \., including \\
+  x[i] <- gsub("\\\\(')|(\\\\[^'])", "\\1\\2", xi)
+  x
+}
+
 remove_space_before_opening_paren <- function(pd_flat) {
   paren_after <- pd_flat$token == "'('"
   if (!any(paren_after)) {

tests/testthat/escaping/basic-escape-in.R

@@ -22,6 +22,9 @@ NULL
 #' things
 #'
 #' @examples
-#' call('\n') # FIXME when single quotes are used, the newline is evaluated
+#' call('\n')
 #' ano("\\.", further = X)
 NULL
+
+'single quotes with
+embedded and \n not embedded line breaks'

tests/testthat/escaping/basic-escape-in_tree

@@ -22,7 +22,9 @@ NULL
 #' things
 #'
 #' @examples
-#' call("
-#' ") # FIXME when single quotes are used, the newline is evaluated
+#' call("\n")
 #' ano("\\.", further = X)
 NULL
+
+"single quotes with
+embedded and \n not embedded line breaks"

tests/testthat/escaping/basic-escape-out.R

@@ -13,7 +13,13 @@ test <- function() {
   single quotes are used
   .'
 
-  'strings with embeded\nline breaks are unfortunately split'
+  'strings with embedded\nline breaks are handled correctly'
+
+  '\\'
+  '\\\''
+  '\\\\'
+  '\\\\\''
+  '\'\\\\\''
 
   # Comments are always preserved
 

tests/testthat/strict/non_strict-in.R

@@ -13,8 +13,13 @@ test <- function() {
   single quotes are used
   ."
 
-  "strings with embeded
-line breaks are unfortunately split"
+  "strings with embedded\nline breaks are handled correctly"
+
+  "\\"
+  "\\'"
+  "\\\\"
+  "\\\\'"
+  "'\\\\'"
 
   # Comments are always preserved