prevent application of inline markup within rethrown messages #870
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
also, inlines `msg` into `cli_abort()` rather than reverting to `abort()`, per https://cli.r-lib.org/reference/inline-markup.html?q=escape#escaping-and-
simonpcouch
changed the title
simonpcouch
commented
Jan 21, 2025
| @@ -162,7 +162,7 @@ random_name <- function(prefix = "") { | |||
| rethrow_database_error <- function(msg, call = trace_back()$call[[1]]) { | |||
| tryCatch( | |||
| res <- parse_database_error(msg), | |||
| error = function(e) cli::cli_abort(msg, call = call) | |||
| error = function(e) cli::cli_abort("{msg}", call = call) | |||
There was a problem hiding this comment.
My initial guess re: the OP was that this had been the source of the failure (i.e. parse_database_error() failed and then the error handling mishandled the message). Turns out it wasn't, but I brought this in line with cli's documentation + added a test in the process that felt worth keeping around.
hadley
approved these changes
Jan 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #859.
Safeguards against mistakenly applying inline markup to driver messages when rethrowing based on the cli documentation.