Merge remote-tracking branch 'origin/cyclocomp-check-time' into cyclocomp-check-time

Author: MichaelChirico

R/assignment_linter.R

@@ -195,5 +195,3 @@ assignment_linter <- function(operator = c("<-", "<<-"),
     lints
   })
 }
-
-drop_or_add <- function(x, y, add) (if (add) union else setdiff)(x, y)

R/extract.R

@@ -51,7 +51,7 @@ get_knitr_pattern <- function(filename, lines) {
     ("knitr" %:::% "detect_pattern")(lines, tolower(("knitr" %:::% "file_ext")(filename))),
     warning = function(cond) {
       if (!grepl("invalid UTF-8", conditionMessage(cond), fixed = TRUE)) {
-        cli_warn(cond)
+        cli_warn(cond) # nocov. No known way to reach here.
       }
       invokeRestart("muffleWarning")
     }

R/get_source_expressions.R

@@ -204,10 +204,12 @@ lint_parse_error_r43 <- function(e, source_expression) {
     line_number <- line_number - 1L
   }
 
+  # Safely handle invalid location info
   if (line_number < 1L || line_number > length(source_expression$lines)) {
-    # Safely handle invalid location info
+    # nocov start
     line_number <- 1L
     column <- 1L
+    # nocov end
   }
 
   line <- fixup_line(source_expression$lines[[line_number]])

R/path_utils.R

@@ -106,15 +106,7 @@ is_valid_long_path <- function(path, lax = FALSE) {
 }
 
 
-split_paths <- function(path, sep = "/|\\\\") {
-  if (!is.character(path)) {
-    cli_abort("Argument {.arg path} should be a {.cls character} vector.")
-  }
-  if (!is.character(sep) || length(sep) != 1L || !nzchar(sep)) {
-    cli_abort("Argument {.arg sep} should be a non-empty regular expression character string.")
-  }
-  Map(split_path, strsplit(path, sep), substr(path, 1L, 1L))
-}
+split_paths <- function(path)  Map(split_path, strsplit(path, "/|\\\\"), substr(path, 1L, 1L))
 
 split_path <- function(dirs, prefix) {
   # add root dir if needed

R/zzz.R

@@ -224,6 +224,7 @@ default_undesirable_operators <- all_undesirable_operators[names(all_undesirable
   NULL
 )]
 
+# nocov start
 rd_undesirable_operators <- function() {
   op_link_map <- c(
     `:::` = "\\link[base:ns-dblcolon]{:::}",
@@ -244,6 +245,7 @@ rd_undesirable_operators <- function() {
     "}"
   )
 }
+# nocov end
 
 #' Default lintr settings
 #'

tests/testthat/test-object_overwrite_linter.R

@@ -175,3 +175,7 @@ test_that("lints vectorize", {
     object_overwrite_linter(packages = c("stats", "base"), allow_names = "sum")
   )
 })
+
+test_that("Validation works", {
+  expect_error(object_overwrite_linter(packages = "invalid_"), "required, but not available", fixed = TRUE)
+})