Merge pull request #459 from lorenzwalthert/fix-quotes

- Make styling of multi-line strings more consistent (#459).

R/rules-spacing.R

@@ -96,16 +96,24 @@ remove_space_after_unary_pm_nested <- function(pd) {
   pd
 }
 
-
+#' Replace single quotes with double quotes
+#'
+#' We do not use `deparse()` as in previous implementations but `paste0()` since
+#' the former approach escapes the reverse backslash in the line break character
+#' "\n" whereas the solution with `paste0()` does not.
+#' @examples
+#' style_text("'here
+#' is a string
+#' '")
+#' @importFrom purrr map map_chr
+#' @param pd_flat A flat parse table.
+#' @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] <-
-    vapply(
-      lapply(pd_flat$text[str_const][str_const_change], parse_text),
-      deparse,
-      character(1L)
-    )
+    map(pd_flat$text[str_const][str_const_change], parse_text) %>%
+    map_chr(~paste0("\"", .x, "\""))
   pd_flat
 }
 

tests/testthat/strict/non_strict-in.R

@@ -4,6 +4,17 @@ test <- function() {
   'even if the string contains an escaped \' single quote'
   'but not if it contains a "double quote'
 
+  "multi-line quotes
+  remain multi-line
+  "
+
+  'That also holds true
+  if
+  single quotes are used
+  .'
+
+  'strings with embeded\nline breaks are unfortunately split'
+
   # Comments are always preserved
 
   function_calls(get_spaces=around_equal)