mirror of
https://github.com/msberends/AMR.git
synced 2026-11-16 07:50:50 +01:00
(v3.0.1.9113) Fix infinite loop in the plain-text message fallback (used without cli or with old cli/rlang), e.g. for wisca(parallel = TRUE) without a future plan
This commit is contained in:
1 parent
01ca2b98ac
commit
f0699c6584
4 files changed
+40
-31
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
Package: AMR
|
Package: AMR
|
||||||
Version: 3.0.1.9112
|
Version: 3.0.1.9113
|
||||||
Date: 2026-10-10
|
Date: 2026-10-10
|
||||||
Title: Antimicrobial Resistance Data Analysis
|
Title: Antimicrobial Resistance Data Analysis
|
||||||
Description: Functions to simplify and standardise antimicrobial resistance (AMR)
|
Description: Functions to simplify and standardise antimicrobial resistance (AMR)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# AMR 3.0.1.9112
|
# AMR 3.0.1.9113
|
||||||
|
|
||||||
Planned as v3.1.0, mid October 2026.
|
Planned as v3.1.0, mid October 2026.
|
||||||
|
|
||||||
|
|||||||
+26
-29
@@ -469,53 +469,49 @@ cli_to_plain <- function(msg, envir = parent.frame()) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# cli inline markup -> plain-text equivalents (one level of glue nesting allowed)
|
# cli inline markup -> plain-text equivalents (one level of glue nesting allowed)
|
||||||
msg <- apply_sub(msg, "\\{\\.fun (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("`", resolve(c), "()`"))
|
msg <- apply_sub(msg, "\\{\\.fun[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("`", resolve(c), "()`"))
|
||||||
msg <- apply_sub(msg, "\\{\\.arg (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("`", resolve(c), "`"))
|
msg <- apply_sub(msg, "\\{\\.arg[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("`", resolve(c), "`"))
|
||||||
msg <- apply_sub(msg, "\\{\\.code (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("`", resolve(c), "`"))
|
msg <- apply_sub(msg, "\\{\\.code[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("`", resolve(c), "`"))
|
||||||
msg <- apply_sub(msg, "\\{\\.val (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0('"', resolve(c), '"'))
|
msg <- apply_sub(msg, "\\{\\.val[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0('"', resolve(c), '"'))
|
||||||
msg <- apply_sub(msg, "\\{\\.field (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0('"', resolve(c), '"'))
|
msg <- apply_sub(msg, "\\{\\.field[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0('"', resolve(c), '"'))
|
||||||
msg <- apply_sub(msg, "\\{\\.cls (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("<", resolve(c), ">"))
|
msg <- apply_sub(msg, "\\{\\.cls[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("<", resolve(c), ">"))
|
||||||
msg <- apply_sub(msg, "\\{\\.pkg (\\{[^}]+\\}|[^}]+)\\}", function(c) resolve(c))
|
msg <- apply_sub(msg, "\\{\\.pkg[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) resolve(c))
|
||||||
msg <- apply_sub(msg, "\\{\\.strong (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("*", resolve(c), "*"))
|
msg <- apply_sub(msg, "\\{\\.strong[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("*", resolve(c), "*"))
|
||||||
msg <- apply_sub(msg, "\\{\\.emph (\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("*", resolve(c), "*"))
|
msg <- apply_sub(msg, "\\{\\.emph[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) paste0("*", resolve(c), "*"))
|
||||||
msg <- apply_sub(msg, "\\{\\.help ([^}]+)\\}", function(c) {
|
msg <- apply_sub(msg, "\\{\\.help[[:space:]]+([^}]+)\\}", function(c) {
|
||||||
# Handle [display text](topic) markdown link format: extract just the display text
|
# Handle [display text](topic) markdown link format: extract just the display text
|
||||||
m <- regmatches(c, regexec("^\\[(.*)\\]\\([^)]*\\)$", c))[[1L]]
|
m <- regmatches(c, regexec("^\\[(.*)\\]\\([^)]*\\)$", c))[[1L]]
|
||||||
if (length(m) >= 2L) m[2L] else paste0("`", resolve(c), "`")
|
if (length(m) >= 2L) m[2L] else paste0("`", resolve(c), "`")
|
||||||
})
|
})
|
||||||
msg <- apply_sub(msg, "\\{\\.topic ([^}]+)\\}", function(c) {
|
msg <- apply_sub(msg, "\\{\\.topic[[:space:]]+([^}]+)\\}", function(c) {
|
||||||
# Handle [display text](topic) markdown link format: extract just the display text
|
# Handle [display text](topic) markdown link format: extract just the display text
|
||||||
m <- regmatches(c, regexec("^\\[(.*)\\]\\([^)]*\\)$", c))[[1L]]
|
m <- regmatches(c, regexec("^\\[(.*)\\]\\([^)]*\\)$", c))[[1L]]
|
||||||
if (length(m) >= 2L) m[2L] else paste0("?", resolve(c))
|
if (length(m) >= 2L) m[2L] else paste0("?", resolve(c))
|
||||||
})
|
})
|
||||||
msg <- apply_sub(msg, "\\{\\.url (\\{[^}]+\\}|[^}]+)\\}", function(c) resolve(c))
|
msg <- apply_sub(msg, "\\{\\.url[[:space:]]+(\\{[^}]+\\}|[^}]+)\\}", function(c) resolve(c))
|
||||||
msg <- apply_sub(msg, "\\{\\.href ([^}]+)\\}", function(c) {
|
msg <- apply_sub(msg, "\\{\\.href[[:space:]]+([^}]+)\\}", function(c) {
|
||||||
# Handle [display text](url) markdown link format: extract just the URL
|
# Handle [display text](url) markdown link format: extract just the URL
|
||||||
m <- regmatches(c, regexec("^\\[.*\\]\\(([^)]+)\\)$", c))[[1L]]
|
m <- regmatches(c, regexec("^\\[.*\\]\\(([^)]+)\\)$", c))[[1L]]
|
||||||
if (length(m) >= 2L) m[2L] else resolve(c)
|
if (length(m) >= 2L) m[2L] else resolve(c)
|
||||||
})
|
})
|
||||||
|
|
||||||
# bare {variable} or {expression} -> evaluate in caller's environment
|
# bare {variable} or {expression} -> evaluate in caller's environment;
|
||||||
while (grepl("\\{[^{}]+\\}", msg)) {
|
# processed from left to right, so that an expression that cannot be evaluated is kept as is
|
||||||
m <- regexec("\\{([^{}]+)\\}", msg)
|
out <- ""
|
||||||
matches <- regmatches(msg, m)[[1]]
|
repeat {
|
||||||
if (length(matches) < 2L) break
|
idx <- regexpr("\\{[^{}]+\\}", msg)
|
||||||
full_match <- matches[1L]
|
if (idx == -1L) break
|
||||||
inner <- matches[2L]
|
full_match <- regmatches(msg, idx)
|
||||||
|
inner <- substr(full_match, 2L, nchar(full_match) - 1L)
|
||||||
replacement <- tryCatch(
|
replacement <- tryCatch(
|
||||||
paste0(as.character(eval(parse(text = inner), envir = envir)), collapse = ", "),
|
paste0(as.character(eval(parse(text = inner), envir = envir)), collapse = ", "),
|
||||||
error = function(e) full_match
|
error = function(e) full_match
|
||||||
)
|
)
|
||||||
idx <- regexpr(full_match, msg, fixed = TRUE)
|
out <- paste0(out, substr(msg, 1L, idx - 1L), replacement)
|
||||||
if (idx == -1L) break
|
msg <- substr(msg, idx + attr(idx, "match.length"), nchar(msg))
|
||||||
msg <- paste0(
|
|
||||||
substr(msg, 1L, idx - 1L),
|
|
||||||
replacement,
|
|
||||||
substr(msg, idx + nchar(full_match), nchar(msg))
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
msg
|
paste0(out, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
# this alternative wrapper to the message(), warning() and stop() functions:
|
# this alternative wrapper to the message(), warning() and stop() functions:
|
||||||
@@ -677,7 +673,8 @@ stop_ <- function(...,
|
|||||||
}
|
}
|
||||||
msg_call <- paste0("in ", call_name, "():")
|
msg_call <- paste0("in ", call_name, "():")
|
||||||
}
|
}
|
||||||
plain_msg <- cli_to_plain(trimws2(word_wrap(msg, as_note = FALSE)), envir = parent.frame())
|
# convert before wrapping, as wrapping could otherwise break the markup
|
||||||
|
plain_msg <- trimws2(word_wrap(cli_to_plain(msg, envir = parent.frame()), as_note = FALSE))
|
||||||
stop(paste(msg_call, plain_msg), call. = FALSE)
|
stop(paste(msg_call, plain_msg), call. = FALSE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,3 +98,15 @@ test_that("test-misc.R", {
|
|||||||
expect_true(is_right, info = "the environmental data cannot be found for tidymodels/prep()")
|
expect_true(is_right, info = "the environmental data cannot be found for tidymodels/prep()")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test_that("test-cli_to_plain", {
|
||||||
|
# plain-text fallback for when cli or rlang is unavailable: must always terminate, also when
|
||||||
|
# word wrapping breaks a line within markup, or for expressions that cannot be evaluated
|
||||||
|
expect_identical(AMR:::cli_to_plain("a {.code\nx()} b"), "a `x()` b")
|
||||||
|
expect_identical(AMR:::cli_to_plain("{.arg x} {not_an_object_in_AMR} {1 + 1}"), "`x` {not_an_object_in_AMR} 2")
|
||||||
|
msg <- "Setting {.code parallel = TRUE} requires a non-sequential {.help [{.fun future::plan}](future::plan)} to be active."
|
||||||
|
expect_identical(
|
||||||
|
gsub("[[:space:]]+", " ", AMR:::cli_to_plain(AMR:::word_wrap(msg, width = 40))),
|
||||||
|
"Setting `parallel = TRUE` requires a non-sequential `future::plan()` to be active."
|
||||||
|
)
|
||||||
|
})
|
||||||
Reference in new issue
Block a user