Merge branch 'main' into issue#590

DESCRIPTION

@@ -59,4 +59,4 @@ Config/Needs/website:
     vctrs
 Config/testthat/edition: 3
 Encoding: UTF-8
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2

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.

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")) {
 

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"

R/pluralize.R

@@ -9,7 +9,11 @@ NULL
 make_quantity <- function(object) {
   val <- if (is.numeric(object)) {
     stopifnot(length(object) == 1)
-    as.integer(object)
+
+    if (is.finite(object))
+      as.integer(object)
+    else
+      object
   } else {
     length(object)
   }
@@ -87,13 +91,16 @@ process_plural <- function(qty, code) {
   parts <- strsplit(str_tail(code), "/", fixed = TRUE)[[1]]
   if (last_character(code) == "/") parts <- c(parts, "")
   if (length(parts) == 1) {
-    if (qty != 1) parts[1] else ""
+    if (is.finite(qty) & qty == 1) "" else parts[1]
   } else if (length(parts) == 2) {
-    if (qty == 1) parts[1] else parts[2]
+    if (is.finite(qty) & qty == 1)
+      parts[1]
+    else
+      parts[2]
   } else if (length(parts) == 3) {
-    if (qty == 0) {
+    if (is.finite(qty) & qty == 0) {
       parts[1]
-    } else if (qty == 1) {
+    } else if (is.finite(qty) & qty == 1) {
       parts[2]
     } else {
       parts[3]