From 1d16d0c0820d63217db1c900a925eaacee36226b Mon Sep 17 00:00:00 2001 From: dgkf <18220321+dgkf@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:51:18 -0400 Subject: [PATCH] adding handling for empty expression `x[i, ]` edge case --- R/helpers_covr.R | 2 ++ tests/testthat/test-helpers_covr.R | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/R/helpers_covr.R b/R/helpers_covr.R index a41bcef15..6cc9b4487 100644 --- a/R/helpers_covr.R +++ b/R/helpers_covr.R @@ -54,6 +54,8 @@ h_covr_detrace <- function(expr) { } detrace <- function(x) { + # returns "missing" expression to avoid errors with calls + if (x == bquote()) return(x) x <- h_covr_detrace_call(x) if (is.call(x)) x[-1] <- lapply(x[-1], h_covr_detrace) x diff --git a/tests/testthat/test-helpers_covr.R b/tests/testthat/test-helpers_covr.R index 7d82260f2..934cfd745 100644 --- a/tests/testthat/test-helpers_covr.R +++ b/tests/testthat/test-helpers_covr.R @@ -59,6 +59,20 @@ test_that("h_covr_detrace removes all covr traces", { expr ) + # case when an argument is missing, as in `x[i, ]` + expr <- quote(if (TRUE) { + covr:::count("file.R:1:2:3:4:5:6:7:8") + 1 + 2 + if (TRUE) { + covr:::count("file.R:11:12:13:14:15:16:17:18") + x[i, ] + } + }) + + expect_equal( + withr::with_envvar(c(R_COVR = "true"), h_covr_detrace(expr)), + quote(1 + 2 + x[i, ]) + ) + expr <- quote(function(x) { if (TRUE) { covr:::count("file.R:1:2:3:4:5:6:7:8")