Merge pull request #133 from r-lib/warning-compat

Restore previous footer behaviour

NAMESPACE

@@ -1,6 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(cnd_footer,lifecycle_warning_deprecated)
+S3method(print,lifecycle_warnings)
 export(badge)
 export(deprecate_soft)
 export(deprecate_stop)

R/deprecated.R

@@ -174,10 +174,14 @@ deprecate_soft0 <- function(msg) {
 }
 
 deprecate_warn0 <- function(msg, trace = NULL, always = FALSE) {
-  footer <- paste_line(
-    if (!always) silver("This warning is displayed once every 8 hours."),
-    silver("Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.")
-  )
+  footer <- function(...) {
+    if (is_interactive()) {
+      c(
+        if (!always) silver("This warning is displayed once every 8 hours."),
+        silver("Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.")
+      )
+    }
+  }
   wrn <- new_deprecated_warning(msg, trace, footer = footer)
 
   # Record muffled warnings if testthat is running because it

R/warning.R

@@ -32,24 +32,28 @@
 #' }
 #' @export
 last_lifecycle_warnings <- function() {
-  warnings_env$warnings
+  structure(
+    warnings_env$warnings,
+    class = c("lifecycle_warnings", "list")
+  )
 }
 
-new_deprecated_warning <- function(msg, trace, ...) {
+new_deprecated_warning <- function(msg, trace, ..., footer = NULL) {
   warning_cnd(
     "lifecycle_warning_deprecated",
     message = msg,
     trace = trace,
+    footer = footer,
     internal = list(...)
   )
 }
 
 #' @export
-cnd_footer.lifecycle_warning_deprecated <- function(cnd, ...) {
-  cnd$internal$footer
+print.lifecycle_warnings <- function(x, ...) {
+  local_interactive(FALSE)
+  print(unclass(x))
 }
 
-
 warnings_env <- env(empty_env())
 
 init_warnings <- function() {

tests/testthat/_snaps/deprecated.md

@@ -5,8 +5,6 @@
     Condition
       Warning:
       `foo()` was deprecated in lifecycle 1.0.0.
-      This warning is displayed once every 8 hours.
-      Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
     Code
       deprecate()
 
@@ -17,13 +15,11 @@
     Condition
       Warning:
       `foo()` was deprecated in lifecycle 1.0.0.
-      Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
     Code
       deprecate(always = TRUE)
     Condition
       Warning:
       `foo()` was deprecated in lifecycle 1.0.0.
-      Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
 
 # what deprecation messages are readable
 

tests/testthat/_snaps/warning.md

@@ -7,7 +7,6 @@
       <warning/lifecycle_warning_deprecated>
       Warning:
       `trace()` was deprecated in lifecycle 1.0.0.
-      Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
       ---
       Backtrace:
         1. lifecycle::expect_deprecated(f())

tests/testthat/test-lifecycle.R

@@ -58,13 +58,14 @@ test_that("soft-deprecation warnings are issued when called from child of global
 
 test_that("deprecation warnings are not displayed again", {
   local_options(lifecycle_verbosity = NULL)
+  local_interactive()
 
   wrn <- catch_cnd(
     deprecate_warn("1.0.0", "foo()", id = "once-every-8-hours-note"),
     classes = "warning"
   )
-  footer <- wrn$internal$footer
-  expect_true(is_string(footer) && grepl("once every 8 hours", footer))
+  footer <- cnd_footer(wrn)
+  expect_true(is_character(footer) && any(grepl("once every 8 hours", footer)))
 
   local_options(lifecycle_verbosity = "warning")