Use glue's .literal argument

Fixes #370
r-lib · Dec 16, 2021 · 5c2904c · 5c2904c
1 parent aaf7cf1
commit 5c2904c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 19,7 @@ BugReports: https://github.com/r-lib/cli/issues
 RoxygenNote: 7.1.2
 Depends: R (>= 2.10)
 Imports:
- glue,
  glue (>= 1.5.1.9500),
  utils
 Suggests:
  asciicast,
@@ -41,7 41,9 @@ Suggests:
  tibble,
  whoami,
  withr
-Remotes: r-lib/testthat@fix/snapshot-empty-lines
 Remotes: 
  r-lib/testthat@fix/snapshot-empty-lines,
  tidyverse/glue
 Config/testthat/edition: 3
 Config/Needs/website:
  r-lib/asciicast,

diff --git a/R/inline.R b/R/inline.R
@@ -216,6 216,7 @@ clii__inline <- function(app, text, .list) {
  .transformer = inline_transformer,
  .open = paste0("{", t$values$marker),
  .close = paste0(t$values$marker, "}"),
  .literal = TRUE,
  .trim = TRUE
  )
  })
@@ -272,7 273,7 @@ glue_cmd <- function(..., .envir) {
  str <- paste0(unlist(list(...), use.names = FALSE), collapse = "")
  values <- new.env(parent = emptyenv())
  transformer <- make_cmd_transformer(values)
- pstr <- glue::glue(str, .envir = .envir, .transformer = transformer, .trim = TRUE)
  pstr <- glue::glue(str, .envir = .envir, .transformer = transformer, .literal = TRUE, .trim = TRUE)
  glue_delay(
  str = post_process_plurals(pstr, values),
  values = values