Refactor get_active_file() #1730
Merged
Conversation
This file contains hidden or 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
* Make it much broader so it now works with any file in `R/`, `src/` or `tests/testthat`. Fixes #1566 * This new foundation made it possible to make `use_c()` and `use_rcpp()` (and friends) to work the same way as `use_r()`/use_test()`. * Since I was in here I fixed #1690. * I also refactored the code to make it easier to test. * I switched the errors I touch to use `cli::cli_abort()` so the messaging can point to the correct user facing function. * I generally refactored the error handling so it happens in one central location.
hadley
force-pushed
the
refactor-active-file
branch
from
990cbad to
047cb88
Compare
hadley
commented
Jan 17, 2023
| #' @inheritParams edit_file | ||
| #' @seealso The [testing](https://r-pkgs.org/tests.html) and | ||
| #' [R code](https://r-pkgs.org/r.html) chapters of | ||
| #' [R Packages](https://r-pkgs.org). | ||
| #' @export | ||
| use_r <- function(name = NULL, open = rlang::is_interactive()) { | ||
| check_not_empty_file_name(name) |
There was a problem hiding this comment.
I inlined check_not_empty_filename() into check_file_name() and moved that into compute_name().
|
|
||
| test_path <- proj_path("tests", "testthat", paste0("test-", name, ".R")) | ||
| if (!file_exists(test_path)) { | ||
| ui_todo("Call {ui_code('use_test()')} to create a matching test file") |
There was a problem hiding this comment.
I removed this because no other helper includes similar text, but I can restore it if you think it's important.
| #' | ||
| #' @details | ||
| #' | ||
| #' When using compiled code, please note that there must be at least one file |
There was a problem hiding this comment.
This weird wrinkle (implemented in use_src_example_script()) is no longer needed because we always create a file.
jennybc
approved these changes
Jan 18, 2023
R/r.R
Outdated
| valid_file_name <- function(x) { | ||
| grepl("^[a-zA-Z0-9._-]+$", x) | ||
| } | ||
| rel_path <- path_dir(proj_rel_path(path)) |
There was a problem hiding this comment.
rel_path feels like a confusing name for the immediate parent directory within the project, but I guess it's not terribly important.
Co-authored-by: Jennifer (Jenny) Bryan <jenny.f.bryan@gmail.com>
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.
R/,src/ortests/testthat. Fixes Teachuse_test()/test_active_file()aboutsrc#1566use_c()anduse_rcpp()(and friends) to work the same way asuse_r()/use_test()`.cli::cli_abort()so the messaging can point to the correct user facing function.