Merge branch 'main' into obj-name-str

Author: AshesITR

NEWS.md

@@ -3,12 +3,12 @@
 ## Bug fixes
 
 * `inner_combine_linter()` no longer throws on length-1 calls to `c()` like `c(exp(2))` or `c(log(3))` (#2017, @MichaelChirico). Such usage is discouraged by `unnecessary_concatenation_linter()`, but `inner_combine_linter()` _per se_ does not apply.
+* `condition_message_linter()` ignores usages of extracted calls like `env$stop(paste(a, b))` (#1455, @MichaelChirico).
 
 ## New and improved features
 
 * `library_call_linter()` can detect if all library calls are not at the top of your script (#2027, @nicholas-masel).
 
-
 ## Changes to defaults
 
 * `assignment_linter()` lints the {magrittr} assignment pipe `%<>%` (#2008, @MichaelChirico). This can be deactivated by setting the new argument `allow_pipe_assign` to `TRUE`.
@@ -38,7 +38,7 @@
 
 * `get_source_expressions()` can handle Sweave/Rmarkdown documents with reference chunks like `<<ref_file>>` (#779, @MichaelChirico).
   Note that these are simply skipped, rather than attempting to retrieve the reference and also lint it.
-  
+
 * `assignment_linter()` no longer lints assignments in braces that include comments when `allow_trailing = FALSE` (#1701, @ashbaldry)
 
 * `object_usage_linter()`

R/condition_message_linter.R

@@ -43,7 +43,10 @@
 condition_message_linter <- function() {
   translators <- c("packageStartupMessage", "message", "warning", "stop")
   xpath <- glue::glue("
-  //SYMBOL_FUNCTION_CALL[ {xp_text_in_table(translators)} ]
+  //SYMBOL_FUNCTION_CALL[
+    ({xp_text_in_table(translators)})
+    and not(preceding-sibling::OP-DOLLAR or preceding-sibling::OP-AT)
+  ]
     /parent::expr
     /following-sibling::expr[
       expr[1][SYMBOL_FUNCTION_CALL[text() = 'paste' or text() = 'paste0']]

tests/testthat/test-condition_message_linter.R

@@ -4,9 +4,11 @@ test_that("condition_message_linter skips allowed usages", {
   expect_lint("stop('a string', 'another')", NULL, linter)
   expect_lint("warning('a string', 'another')", NULL, linter)
   expect_lint("message('a string', 'another')", NULL, linter)
+  # extracted calls likely don't obey base::stop() semantics
+  expect_lint("ctx$stop(paste('a', 'b'))", NULL, linter)
+  expect_lint("ctx@stop(paste('a', 'b'))", NULL, linter)
 
-  # sprintf is OK (really should be gettextf but offering translations
-  #   at google internally is not likely to happen any time soon)
+  # sprintf is OK -- gettextf() enforcement is left to other linters
   expect_lint("stop(sprintf('A %s!', 'string'))", NULL, linter)
 
   # get multiple sep= in one expression