return last node rather than last element

r-lib · Aug 1, 2023 · 6a56619 · 6a56619
1 parent 25f76af
commit 6a56619
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/R/library_call_linter.R b/R/library_call_linter.R
@@ -9,6 +9,11 @@
 #'    linters = library_call_linter()
 #'  )
 #'
+#'  lint(
+#'    text = c("library(dplyr)", "print('test')", "library(tidyr)", "library(purrr)"),
+#'    linters = library_call_linter()
+#'  )
+#'
 #'  # okay
 #'  lint(
 #'    text = c("library(dplyr)", "print('test')"),
@@ -26,30 +31,29 @@
 library_call_linter <- function() {
 
   xpath <- "
-  //SYMBOL_FUNCTION_CALL[text() = 'library'][last()]
+  (//SYMBOL_FUNCTION_CALL[text() = 'library'])[last()]
   //preceding::expr
-  /SYMBOL_FUNCTION_CALL[text() != 'library'][last()]
+  //SYMBOL_FUNCTION_CALL[text() != 'library'][last()]
+  //following::expr[SYMBOL_FUNCTION_CALL[text() = 'library']]
   "
+
   Linter(function(source_expression) {
     if (!is_lint_level(source_expression, "file")) {
       return(list())
     }
 
     xml <- source_expression$full_xml_parsed_content
 
+    writeLines(as.character(xml))
+
     bad_expr <- xml2::xml_find_all(xml, xpath)
 
     if (length(bad_expr) == 0L) {
       return(list())
     }
 
-    bad_expr_library <- xml2::xml_find_all(
-      xml,
-      "//SYMBOL_FUNCTION_CALL[text() = 'library'][last()]"
-    )
-
     xml_nodes_to_lints(
-      bad_expr_library,
+      bad_expr,
       source_expression = source_expression,
       lint_message = "Move all library calls to the top of the script.",
       type = "warning"

diff --git a/man/library_call_linter.Rd b/man/library_call_linter.Rd
diff --git a/tests/testthat/test-library_call_linter.R b/tests/testthat/test-library_call_linter.R
@@ -30,7 +30,7 @@ test_that("library_call_linter warns on disallowed usages", {
   )
 
   expect_lint(c("library(dplyr)", "print('test')", "library(tidyr)", "library(purrr)"),
-    lint_message,
+    list(lint_message, lint_message),
     library_call_linter()
   )
 
@@ -45,7 +45,7 @@ test_that("library_call_linter warns on disallowed usages", {
   )
 
   expect_lint(c("library(dplyr)", "print('test')", "library(tidyr)", "print('test')", "library(tidyr)"),
-    lint_message,
+    list(lint_message, lint_message),
     library_call_linter()
   )
 })