Merge pull request #719 from rundel/issue#590

Avoid duplication of length 1 vecs when width set using ansi_collapse() - #590

NEWS.md

@@ -4,6 +4,9 @@
   (without the serial comma) for two-element vectors if `sep2` is not
   given (@rundel, #681).
 
+* `ansi_collapse()` is now correct for length-1 vectors with style "head"
+  if width is specified (@rundel, #590).
+
 # cli 3.6.3
 
 * cli now builds on ARM Windows.

R/glue.R

@@ -188,7 +188,9 @@ collapse_head <- function(x, sep, sep2, last, trunc, width, ellipsis) {
     nlast <- if (lnx > 2L) 1L else 0L
     wtot  <- sum(wx) + nsep * wsep + nsep2 * wsep2 + nlast * wlast
     if (wtot <= width) {
-      if (lnx == 2L) {
+      if (lnx == 1L) {
+        return(x)
+      } else if (lnx == 2L) {
         return(paste0(x, collapse = sep2))
       } else {
         return(paste0(

tests/testthat/test-collapsing.R

@@ -198,6 +198,13 @@ test_that("ansi_collapse uses `sep2` for length-two inputs", {
                "1 and 2")
 })
 
+test_that("Avoid duplication of length 1 vecs when width set (#590)", {
+  expect_equal(ansi_collapse(1), "1")
+  expect_equal(ansi_collapse(1, style = "head"), "1")
+  expect_equal(ansi_collapse(1, style = "head", width = 70), "1")
+  expect_equal(ansi_collapse(1, style = "head", last = " and again "), "1")
+  expect_equal(ansi_collapse(1, style = "head", width = 70, last = " and again "), "1")
+})
 
 test_that("Issue #681", {
   # sep2 takes precedence