respect digits.secs option, closes #102

- The `digits.secs` option is respected when computing the width for date-time values (#102).
r-lib · Apr 16, 2018 · b62549d · b62549d
1 parent 27420b9
commit b62549d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/R/shaft.R b/R/shaft.R
@@ -121,13 +121,19 @@ pillar_shaft.Date <- function(x, ...) {
 #' @export
 #' @rdname pillar_shaft
 pillar_shaft.POSIXt <- function(x, ...) {
+  width <- 19L
+  digits_secs <- getOption("digits.secs", 0L)
+  if (digits_secs > 0) {
+    width <- width + min(digits_secs, 6) + 1L
+  }
+
   date <- format(x, format = "%Y-%m-%d")
   time <- format(x, format = "%H:%M:%OS")
 
   datetime <- paste0(date, " ", style_subtle(time))
   datetime[is.na(x)] <- NA
 
-  new_pillar_shaft_simple(datetime, width = 19, align = "left")
+  new_pillar_shaft_simple(datetime, width = width, align = "left")
 }
 
 

diff --git a/tests/testthat/bw-out/time-digits-secs.txt b/tests/testthat/bw-out/time-digits-secs.txt
@@ -0,0 +1,3 @@
+<S3: POSIXlt>           
+2017-07-28 18:04:35.0000
+NA                      
diff --git a/tests/testthat/out/time-digits-secs.txt b/tests/testthat/out/time-digits-secs.txt
diff --git a/tests/testthat/test-format_time.R b/tests/testthat/test-format_time.R
@@ -3,4 +3,8 @@ context("format_time")
 test_that("output test", {
   expect_pillar_output(as.POSIXct("2017-07-28 18:04:35 +0200"), filename = "time.txt")
   expect_pillar_output(as.POSIXlt("2017-07-28 18:04:35 +0200"), filename = "time-posix.txt")
+  withr::with_options(
+    list(digits.secs = 4),
+    expect_pillar_output(as.POSIXlt("2017-07-28 18:04:35 +0200"), filename = "time-digits-secs.txt")
+  )
 })