capture specifically generic names

.Rbuildignore

@@ -23,3 +23,4 @@
 ^bench$
 ^tests/testthat/dummy_packages/package/[.]Rbuildignore$
 ^tests/testthat/dummy_packages/package/[.]lintr$
+^tests/testthat/dummy_packages/clean/[.]lintr$

NEWS.md

@@ -23,6 +23,7 @@
 * `lint_dir()` excludes the `renv` and `packrat` directories by default (#697, @AshesITR)
 * `object_name_linter()` now excludes special R hook functions such as `.onLoad` 
   (#500, #614, @AshesITR and @michaelchirico)
+* Improved generic detection for `object_name_linter()` (#737, @AshesITR)
 * `equals_na_linter()` now lints `x != NA` and `NA == x`, and skips usages in comments (#545, @michaelchirico)
 * Malformed Rmd files now cause a lint instead of an error (#571, #575, @AshesITR)
 * `object_name_linter()` gains a new default style, `"symbols"`, which won't lint all-symbol object names 

R/object_name_linters.R

@@ -56,7 +56,9 @@ object_name_linter <- function(styles = c("snake_case", "symbols")) {
       declared_s3_generics(xml),
       namespace_imports(find_package(source_file$filename))$fun,
       names(.knownS3Generics),
-      .S3PrimitiveGenerics, ls(baseenv())))
+      .S3PrimitiveGenerics, ls(baseenv())
+    ))
+    generics <- unique(generics[generics != ""])
 
     style_matches <- lapply(styles, function(style) {
       check_style(nms, style, generics)
@@ -83,7 +85,7 @@ check_style <- function(nms, style, generics = character()) {
   if (any(!conforming)) {
     possible_s3 <- re_matches(
       nms[!conforming],
-      rex(capture(name = "generic", something), ".", capture(name = "method", something))
+      rex(start, capture(name = "generic", or(generics)), ".", capture(name = "method", something), end)
     )
     if (any(!is.na(possible_s3))) {
       has_generic <- possible_s3$generic %in% generics

tests/testthat/dummy_packages/clean/.lintr

@@ -0,0 +1 @@
+exclusions: "R/default_linter_testcode.R"

tests/testthat/dummy_packages/clean/R/clean_generics.R

@@ -0,0 +1,27 @@
+# Regression test for #737 via expecting clean to be lint-free
+
+#' drink_me
+#' @description empty
+#'
+#' @export
+drink_me <- function(x, ...) {
+  UseMethod("drink_me")
+}
+
+#' drink_me for most things
+#' @export
+drink_me.default <- function(x, ...) {
+  1
+}
+
+#' drink_me for lists
+#' @export
+drink_me.list <- function(x, ...) {
+  NULL
+}
+
+#' drink_me for data.frames
+#' @export
+drink_me.data.frame <- function(x, ...) {
+  NULL
+}