diff --git a/R/make_linter_from_regex.R b/R/make_linter_from_regex.R index 59bd37de4..afcbf8f43 100644 --- a/R/make_linter_from_regex.R +++ b/R/make_linter_from_regex.R @@ -34,12 +34,12 @@ make_linter_from_regex <- function(regex, #' Determine if a regex match is covered by an expression in a source_expression #' -#' @param match The position where a regex match was observed. -#' match must have entries "start", "end", and "line_number". -#' @param source_expression A source_expression -#' @param token_type Restrict analysis to tokens of this type, for example, -#' with token_type = "STR_CONST" you can check that a regex match occurs -#' within a string +#' @param match The position where a regex match was observed. +#' It must have the following elements: `"start"`, `"end"`, and `"line_number"`. +#' @param source_expression A source_expression. +#' @param token_type Restrict analysis to tokens of this type, for example, +#' with `token_type = "STR_CONST"` you can check that a regex match occurs +#' within a string. #' @noRd is_match_covered <- function(match, source_expression, token_type = "STR_CONST") { line_number <- match$line_number diff --git a/tests/testthat/test-ci.R b/tests/testthat/test-ci.R index 021f77957..3f4f98762 100644 --- a/tests/testthat/test-ci.R +++ b/tests/testthat/test-ci.R @@ -12,7 +12,6 @@ test_that("GitHub Actions functionality works in a subdirectory", { withr::local_envvar(list(GITHUB_ACTIONS = "true")) withr::local_options(lintr.rstudio_source_markers = FALSE, lintr.github_annotation_project_dir = pkg_path) - lintr:::read_settings(NULL) l <- lint_package( pkg_path, linters = list(assignment_linter()),