Improve conflict_scout() behavior after resolving conflicts (#96)

Fixes #95

NEWS.md

@@ -1,5 +1,8 @@
 # conflicted (development version)
 
+* `conflict_scout()` no longer returns functions whose conflicts have been
+  resolved manually or automatically (#95).
+
 # conflicted 1.2.0
 
 * New `conflicts_prefer()` to easily declare multiple preferences at once:

R/find.R

@@ -7,9 +7,8 @@
 #' @param pkgs Set of packages for which to report conflicts. If `NULL`,
 #'   the default, will report conflicts for all loaded packages
 #' @return A named list of character vectors. The names are functions and
-#'   the values are the packages where they appear. If there is only a single
-#'   package listed, it means that an automated disambiguation has selected
-#'   that function.
+#'   the values are the packages where they appear. Disambiguated functions
+#'   are removed from that list.
 #'
 #'   A user friendly print method displays the result as bulleted list.
 #' @export
@@ -45,7 +44,8 @@ conflict_scout <- function(pkgs = NULL) {
     conflicts[[fun]] <- prefs_resolve(fun, conflicts[[fun]])
   }
 
-  conflicts <- compact(conflicts)
+  # remove all non-conflicts from the list
+  conflicts <- conflicts[lengths(conflicts) > 1]
 
   new_conflict_report(conflicts)
 }

tests/testthat/_snaps/find.md

@@ -11,3 +11,19 @@
       * `ns_env()`: rlang and pkgload
       * `pkg_env()`: rlang and pkgload
 
+# preferences are obeyed
+
+    Code
+      conflict_scout(c("rlang", "prefs"))
+    Message
+      1 conflict
+      * `set_names()`: rlang and prefs
+    Code
+      conflicts_prefer(rlang::set_names())
+    Message
+      [conflicted] Will prefer rlang::set_names over any other package.
+    Code
+      conflict_scout(c("rlang", "prefs"))
+    Message
+      0 conflicts
+

tests/testthat/prefs/DESCRIPTION

@@ -0,0 +1,13 @@
+Package: prefs
+Title: What the Package Does (One Line, Title Case)
+Version: 0.0.0.9000
+Authors@R: c(
+    person("Hadley", "Wickham", , "[email protected]", role = c("aut", "cre")),
+    person("RStudio", role = c("cph", "fnd"))
+  )
+Description: What the package does (one paragraph).
+License: `use_mit_license()`, `use_gpl3_license()` or friends to pick a
+    license
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.1.2

tests/testthat/prefs/NAMESPACE

@@ -0,0 +1 @@
+export(set_names)

tests/testthat/prefs/R/test.R

@@ -0,0 +1 @@
+set_names <- function() {}

tests/testthat/test-find.R

@@ -42,6 +42,19 @@ test_that("can find conflicts with data", {
   expect_named(conflict_scout(c("datasets", "data")), "mtcars")
 })
 
+test_that("preferences are obeyed", {
+  pkgload::load_all(test_path("prefs"), quiet = TRUE)
+  withr::defer(pkgload::unload("prefs"))
+
+  on.exit(prefs_reset(), add = TRUE)
+
+  expect_snapshot({
+    conflict_scout(c("rlang", "prefs"))
+    conflicts_prefer(rlang::set_names())
+    conflict_scout(c("rlang", "prefs"))
+  })
+})
+
 # moved functions ----------------------------------------------------
 
 test_that(".Deprecated call contains function name", {