Improve wrapping

NEWS.md

@@ -1,5 +1,11 @@
 # roxygen2 (development version)
 
+* Arguments containing syntactically significant whitespace (e.g anonymous
+  functions) are now wrapped correctly (#1281).
+
+* Arguments containing non-syntactic values surrounded by back ticks are now 
+  wrapped correctly (#1257).
+
 * DOIs in the `URL` field of the `DESCRIPTION` are now converted to Rd's special
   `\doi{}` tag (@ThierryO, #1296).
 

R/rd-usage.R

@@ -131,7 +131,7 @@ wrap_usage <- function(name, format_name, formals, suffix = NULL, width = 80L) {
 
   # Do we need any wrapping?
   bare <- args_call(name, args)
-  if (nchar(bare, type = "width") < width) {
+  if (!str_detect(bare, "\n") && nchar(bare, type = "width") < width) {
     out <- args_call(format_name(name), args)
   } else if (roxy_meta_get("old_usage", FALSE)) {
     x <- args_call(format_name(name), args)

src/wrapUsage.cpp

@@ -25,9 +25,10 @@ std::vector<std::string> splitByWhitespace(std::string string) {
       }
 
     } else if (*cur == ' ' || *cur == '\t' || *cur == '\n') {
+      if (*cur == '\n') acc += *cur; // newlines are significant whitespace
       out.push_back(acc);
       acc = "";
-    } else if (*cur == '"' || *cur == '\'') {
+    } else if (*cur == '"' || *cur == '\'' || *cur == '`') {
       in_string = *cur;
       acc += *cur;
     } else {

tests/testthat/_snaps/rd-usage.md

@@ -23,6 +23,21 @@
       c = "aaaaaaaaaaaaaaaa"
     ) <- value 
 
+    function_name(
+      x,
+      y,
+      xy = "abcdef",
+      xyz = c(`word word word word` = "abcdef", `word word word` = "abcdef",
+        `word word word` = "abcdef", `word word word` = "abcdef")
+    ) 
+
+    function_name(
+      f = function(x) {
+         1
+         2
+     }
+    ) 
+
 
 # old wrapping style doesn't change unexpectedly
 

tests/testthat/test-rd-usage.R

@@ -291,6 +291,20 @@ test_that("new wrapping style doesn't change unexpectedly", {
           c = 'aaaaaaaaaaaaaaaa',
           value) {}
     }), "\n\n")
+
+    cat(call_to_usage({
+      function_name <- function(x, y, xy = "abcdef",
+       xyz = c(`word word word word` = "abcdef", `word word word` = "abcdef",
+               `word word word` = "abcdef", `word word word` = "abcdef")) {}
+    }), "\n\n")
+
+    cat(call_to_usage({
+      function_name <- function(
+        f = function(x) {
+          1
+          2
+      }) {}
+    }), "\n\n")
   })
 })