Use expr_deparse() in expr_text()

Closes r-lib#357
lionel- · Jan 21, 2018 · 1055a7d · 1055a7d
1 parent 6a2b6bb
commit 1055a7d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/R/expr.R b/R/expr.R
@@ -179,7 +179,7 @@ expr_name <- function(expr) {
 #' @param width Width of each line.
 #' @param nlines Maximum number of lines to extract.
 expr_text <- function(expr, width = 60L, nlines = Inf) {
-  str <- deparse(expr, width.cutoff = width)
+  str <- expr_deparse(expr, width = width)
 
   if (length(str) > nlines) {
     str <- c(str[seq_len(nlines - 1)], "...")

diff --git a/tests/testthat/test-expr.R b/tests/testthat/test-expr.R
@@ -52,7 +52,7 @@ test_that("name symbols, calls, and scalars", {
   expect_identical(expr_name(quote(foo(bar))), "foo(bar)")
   expect_identical(expr_name(1L), "1")
   expect_identical(expr_name("foo"), "foo")
-  expect_identical(expr_name(function() NULL), "function () ...")
+  expect_identical(expr_name(function() NULL), "<function() NULL>")
   expect_error(expr_name(1:2), "must quote a symbol, scalar, or call")
   expect_identical(expr_name(expr(function() { a; b })), "function() ...")
 })

diff --git a/tests/testthat/test-quo.R b/tests/testthat/test-quo.R
@@ -122,7 +122,7 @@ test_that("quosures are spliced", {
   expect_identical(quo_text(q), "foo(bar, baz(baz, 3))")
 
   q <- expr_interp(~foo::bar(!! function(x) ...))
-  expect_identical(f_text(q), "foo::bar(function (x) \n...)")
+  expect_identical(f_text(q), "foo::bar(<function(x) ...>)")
 
   q <- quo(!! quo(!! quo(foo(!! quo(!! quo(bar(!! quo(!! quo(!! quo(baz))))))))))
   expect_identical(quo_text(q), "foo(bar(baz))")