Allow highlighting of some empty expressions #1310
Merged
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
Improved version of r-lib#1307 accounting for problems caused by empty expressions consisting of empty strings or whitespace only. Prevents highlight markup from being stripped from code that consists entirely of code comments (only lines beginning with #'s). A partial fix for r-lib#1296, but would still not syntax highlight code chunks that resulted in syntax errors (e.g., when knitr chunk options collapse = TRUE and comment = NA are set)
|
@jayhesselberth pretty sure this fixes the site build issue. Narrowed the problem down to this blank line Line 25 in c181e5c pkgdown::highlight_text causing the error in highlight::highlight
|
This was referenced May 13, 2020
R/highlight.r
Outdated
| # Failed to parse, or yielded empty expression | ||
| if (length(expr) == 0) { | ||
| # Failed to parse or is white-space only/empty | ||
| if (is.null(expr) || !nchar(trimws(text))) { |
There was a problem hiding this comment.
Just test for the empty string here: trimws(text) == ""
There was a problem hiding this comment.
I think I was also aiming to catch cases where text = character(0) but now that I look at it !nchar wouldn't do that anyway.
There was a problem hiding this comment.
And I don't even need to do that cos it is covered at
Line 5 in 2513c80
|
Thanks! |
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.
Improved version of #1307 accounting for problems caused by empty expressions consisting of empty strings or whitespace only.
Prevents highlight markup from being stripped from code that consists entirely of code comments (only lines beginning with #'s).
A partial fix for #1296, but would still not syntax highlight code chunks that resulted in syntax
errors (e.g., when knitr chunk options collapse = TRUE and comment = NA are set)