Merge pull request #652 from cynkra/f-641-paste-3

- `dm_paste()` output uses trailing commas in the `dm::dm()` and `tibble::tibble()` calls, and sorts column attributes by name, for better modularity (#641).
cynkra · Oct 13, 2021 · 410de24 · TSchiefer · Oct 14, 2021 · krlmlr
2 parents 72dbcd0 + 9943357
commit 410de24
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/R/paste.R b/R/paste.R
@@ -209,6 +209,11 @@ df_paste <- function(x, tab) {
 }
 
 deparse_line <- function(x) {
+  attrs <- attributes(x)
+  # Workaround necessary for R < 3.5:
+  if (length(attrs) > 0) {
+    attributes(x) <- attrs[sort(names(attrs))]
+  }
   x <- deparse(x, width.cutoff = 500, backtick = TRUE)
   gsub(" *\n *", " ", x)
 }

diff --git a/tests/testthat/_snaps/paste.md b/tests/testthat/_snaps/paste.md
@@ -12,7 +12,9 @@
     Message <cliMessage>
       a <- tibble::tibble(
       )
-      dm::dm(a)
+      dm::dm(
+        a,
+      )
     Code
       # baseline
       dm_for_filter() %>% dm_paste()
@@ -190,7 +192,7 @@
         distance = numeric(0),
         hour = numeric(0),
         minute = numeric(0),
-        time_hour = structure(numeric(0), tzone = "America/New_York", class = c("POSIXct", "POSIXt")),
+        time_hour = structure(numeric(0), class = c("POSIXct", "POSIXt"), tzone = "America/New_York"),
       )
       planes <- tibble::tibble(
         tailnum = character(0),
@@ -218,7 +220,7 @@
         precip = numeric(0),
         pressure = numeric(0),
         visib = numeric(0),
-        time_hour = structure(numeric(0), tzone = "America/New_York", class = c("POSIXct", "POSIXt")),
+        time_hour = structure(numeric(0), class = c("POSIXct", "POSIXt"), tzone = "America/New_York"),
       )
       dm::dm(
         airlines,