Labelling for mutli-line functions

Fixes #583
r-lib · Oct 1, 2017 · f7dd41b · f7dd41b
1 parent 1e5997f
commit f7dd41b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/R/expectation.R b/R/expectation.R
@@ -71,7 +71,12 @@ label <- function(x) {
   } else {
     chr <- deparse(x)
     if (length(chr) > 1) {
-      chr <- paste(deparse(as.call(list(x[[1]], quote(...)))), collapse = "\n")
+      if (identical(x[[1]], quote(`function`))) {
+        x[[3]] <- quote(...)
+        chr <- paste(deparse(x), collapse = "\n")
+      } else {
+        chr <- paste(deparse(as.call(list(x[[1]], quote(...)))), collapse = "\n")
+      }
     }
     chr
   }

diff --git a/tests/testthat/test-label.R b/tests/testthat/test-label.R
@@ -7,6 +7,12 @@ test_that("labelling compound {} expression gives single string", {
   expect_type(out, "character")
 })
 
+test_that("can label multiline functions", {
+  expect_equal(
+    label(function(x, y) {}),
+    "function(x, y) ..."
+  )
+})
 
 test_that("can find label after it's been forced", {
   f <- function(x) {