Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace str_replace_all() with base equivalent #2174

Merged
merged 12 commits into from
Sep 28, 2022
Merged

Replace str_replace_all() with base equivalent #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
878d7b5
Add util fn `str_complete_replace()`
rich-iannone Sep 22, 2022
660aaf1
Update Collate field in DESCRIPTION
rich-iannone Sep 22, 2022
6283cc7
Replace `str_replace_all()` with base equivalent
rich-iannone Sep 22, 2022
44cb92a
Add perl arg to `str_complete_replace()`
rich-iannone Sep 22, 2022
17f5224
Use `perl = FALSE`
rich-iannone Sep 22, 2022
30fee52
Update utils-string_formatting.R
rich-iannone Sep 27, 2022
6176459
Update utils-vignettes.R
rich-iannone Sep 27, 2022
6a56922
Modify regex w/ lookbehind to work with gsub/PERL
rich-iannone Sep 27, 2022
5458550
Revert to non-looped replacement
rich-iannone Sep 27, 2022
8c35a1b
Update utils-vignettes.R
rich-iannone Sep 27, 2022
19ea093
Merged origin/master into str-replace-all-replace
yihui Sep 28, 2022
6ea0721
since str_complete_replace() is used only once in the package, let's …
yihui Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion R/pattern.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ all_patterns = list(
`md` = list(
chunk.begin = '^[\t >]*```+\\s*\\{([a-zA-Z0-9_]+( *[ ,].*)?)\\}\\s*$',
chunk.end = '^[\t >]*```+\\s*$',
ref.chunk = '^\\s*<<(.+)>>\\s*$', inline.code = '(?<!(^|\n)``)`r[ #]([^`]+)`'),
ref.chunk = '^\\s*<<(.+)>>\\s*$',
inline.code = '(?<!(^``))(?<!(\n``))`r[ #]([^`]+)\\s*`'),

`rst` = list(
chunk.begin = '^\\s*[.][.]\\s+\\{r(.*)\\}\\s*$',
Expand Down
2 changes: 1 addition & 1 deletion R/utils-vignettes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ knit_filter = function(ifile, encoding = 'UTF-8') {
m = group_indices(grepl(p1, x), grepl(p2, x))
i = m %% 2 == 0
x[i] = '' # remove code chunks
x[!i] = stringr::str_replace_all(x[!i], p$inline.code, '') # remove inline code
x[!i] = gsub(p$inline.code, '', x[!i], perl = TRUE) # remove inline code
structure(x, control = '-H -t')
}

Expand Down