Add a {test} for ui_escape_glue() helper

NEWS.md

@@ -1,5 +1,7 @@
 # usethis (development version)
 
+* `pr_resume()` (without a specific `branch`) and `pr_fetch()` (without a specific `number`) no longer error when a branch name contains curly braces (#2107, @jonthegeek).
+
 # usethis 3.2.1
 
 * `create_quarto_project()` exits early if the Quarto CLI does not appear to be

R/pr.R

@@ -944,7 +944,7 @@ choose_branch <- function(exclude = character()) {
         )
         at_user <- glue("@{pr_user}")
         template <- ui_pre_glue(
-          "{pretty_name} {cli::symbol$arrow_right} <<href_number>> ({.field <<at_user>>}): {.val <<pr_title>>}"
+          "{pretty_name} {cli::symbol$arrow_right} <<href_number>> ({.field <<at_user>>}): {.val <<ui_escape_glue(pr_title)>>}"
         )
         cli::format_inline(template)
       }
@@ -988,14 +988,15 @@ choose_pr <- function(tr = NULL, pr_dat = NULL) {
     function(pr_number, pr_html_url, pr_user, pr_state, pr_title) {
       href_number <- ui_pre_glue("{.href [PR #<<pr_number>>](<<pr_html_url>>)}")
       at_user <- glue("@{pr_user}")
+      pr_title_escaped <- ui_escape_glue(pr_title)
       if (some_closed) {
         template <- ui_pre_glue(
-          "<<href_number>> ({.field <<at_user>>}, {pr_state}): {.val <<pr_title>>}"
+          "<<href_number>> ({.field <<at_user>>}, {pr_state}): {.val <<pr_title_escaped>>}"
         )
         cli::format_inline(template)
       } else {
         template <- ui_pre_glue(
-          "<<href_number>> ({.field <<at_user>>}): {.val <<pr_title>>}"
+          "<<href_number>> ({.field <<at_user>>}): {.val <<pr_title_escaped>>}"
         )
         cli::format_inline(template)
       }

R/utils-ui.R

@@ -162,6 +162,11 @@ ui_pre_glue <- function(..., .envir = parent.frame()) {
   glue(..., .open = "<<", .close = ">>", .envir = .envir)
 }
 
+ui_escape_glue <- function(x) {
+  gsub("([{}])", "\\1\\1", x)
+}
+
+
 bulletize <- function(x, bullet = "*", n_show = 5, n_fudge = 2) {
   n <- length(x)
   n_show_actual <- compute_n_show(n, n_show, n_fudge)

tests/testthat/test-utils-ui.R

@@ -267,3 +267,17 @@ cli::test_that_cli(
   },
   configs = c("plain", "fancy")
 )
+
+test_that("ui_escape_glue() doubles curly braces", {
+  expect_equal(ui_escape_glue("no braces"), "no braces")
+  expect_equal(ui_escape_glue("one { brace"), "one {{ brace")
+  expect_equal(ui_escape_glue("one } brace"), "one }} brace")
+  expect_equal(
+    ui_escape_glue("A {brace_set} in text"),
+    "A {{brace_set}} in text"
+  )
+  expect_equal(
+    ui_escape_glue("{multiple} {brace} {sets}"),
+    "{{multiple}} {{brace}} {{sets}}"
+  )
+})