Merge pull request #718 from rundel/issue#681

Use `last` for length 2 vectors with `ansi_collapse()` when `sep2` not used
r-lib · Aug 28, 2024 · 8d707ba · 8d707ba
2 parents 2ddcc1a + d74cb7e
commit 8d707ba
Show file tree

Hide file tree

Showing 40 changed files with 135 additions and 64 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -59,4 +59,4 @@ Config/Needs/website:
     vctrs
 Config/testthat/edition: 3
 Encoding: UTF-8
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # cli (development version)
 
+* `ansi_collapse()` and inline collapsing now uses `last` as the separator
+  (without the serial comma) for two-element vectors if `sep2` is not
+  given (@rundel, #681).
+
 # cli 3.6.3
 
 * cli now builds on ARM Windows.

diff --git a/R/glue.R b/R/glue.R
@@ -79,7 +79,8 @@ drop_null <- function(x) {
 #' to collapse.
 #' @param sep Separator. A character string.
 #' @param sep2 Separator for the special case that `x` contains only two
-#' elements. A character string.
+#' elements. A character string. Defaults to the value of `last` without the
+#' serial comma.
 #' @param last Last separator, if there is no truncation. E.g. use
 #' `", and "` for the [serial
 #' comma](https://en.wikipedia.org/wiki/Serial_comma). A character string.
@@ -112,7 +113,7 @@ drop_null <- function(x) {
 #' # head style
 #' ansi_collapse(letters, trunc = 5, style = "head")
 
-ansi_collapse <- function(x, sep = ", ", sep2 = " and ", last = ", and ",
+ansi_collapse <- function(x, sep = ", ", sep2 = sub("^,", "", last), last = ", and ",
                           trunc = Inf, width = Inf, ellipsis = symbol$ellipsis,
                           style = c("both-ends", "head")) {
 

diff --git a/R/inline.R b/R/inline.R
@@ -43,9 +43,9 @@ inline_generic <- function(app, x, style) {
 }
 
 inline_collapse <- function(x, style = list()) {
-  sep <- style[["vec-sep"]] %||% style[["vec_sep"]] %||% ", "
-  sep2 <- style[["vec-sep2"]] %||% style[["vec_sep2"]] %||% " and "
   last <- style[["vec-last"]] %||% style[["vec_last"]] %||% ", and "
+  sep <- style[["vec-sep"]] %||% style[["vec_sep"]] %||% ", "
+  sep2 <- style[["vec-sep2"]] %||% style[["vec_sep2"]] %||% sub("^,", "", last)
 
   trunc <- style[["vec-trunc"]] %||% style[["vec_trunc"]] %||% 20L
   col_style <- style[["vec-trunc-style"]] %||% "both-ends"

diff --git a/man/ansi_align.Rd b/man/ansi_align.Rd
diff --git a/man/ansi_collapse.Rd b/man/ansi_collapse.Rd
diff --git a/man/ansi_columns.Rd b/man/ansi_columns.Rd
diff --git a/man/ansi_nchar.Rd b/man/ansi_nchar.Rd
diff --git a/man/ansi_strsplit.Rd b/man/ansi_strsplit.Rd
diff --git a/man/ansi_strtrim.Rd b/man/ansi_strtrim.Rd
diff --git a/man/ansi_strwrap.Rd b/man/ansi_strwrap.Rd
diff --git a/man/ansi_toupper.Rd b/man/ansi_toupper.Rd
diff --git a/man/ansi_trimws.Rd b/man/ansi_trimws.Rd
diff --git a/man/cli_abort.Rd b/man/cli_abort.Rd
diff --git a/man/cli_alert.Rd b/man/cli_alert.Rd
diff --git a/man/cli_blockquote.Rd b/man/cli_blockquote.Rd
diff --git a/man/cli_bullets.Rd b/man/cli_bullets.Rd
diff --git a/man/cli_bullets_raw.Rd b/man/cli_bullets_raw.Rd
diff --git a/man/cli_dl.Rd b/man/cli_dl.Rd
diff --git a/man/cli_h1.Rd b/man/cli_h1.Rd
diff --git a/man/cli_li.Rd b/man/cli_li.Rd
diff --git a/man/cli_ol.Rd b/man/cli_ol.Rd
diff --git a/man/cli_process_start.Rd b/man/cli_process_start.Rd
diff --git a/man/cli_progress_along.Rd b/man/cli_progress_along.Rd
diff --git a/man/cli_progress_bar.Rd b/man/cli_progress_bar.Rd