fixes

r-lib · Aug 15, 2024 · 8a55490 · 8a55490
1 parent 722271c
commit 8a55490
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/R/attr.R b/R/attr.R
@@ -110,13 +110,15 @@ detect_void_name <- function(x) {
 is_dictionaryish <- function(x) {
   # 2022-01: Used in many packages. Don't deprecate without a
   # replacement.
-  if (!length(x)) {
-    return(!is.null(x))
-  }
-  if (is.null(names(x))) {
+  if (is.null(x)) {
     TRUE
   } else {
+    if (!length(x)) {
+      return(!is.null(x))
+    }
+
     is_named(x) && !any(duplicated(names(x)))
+
   }
 }
 

diff --git a/tests/testthat/test-attr.R b/tests/testthat/test-attr.R
@@ -187,7 +187,7 @@ test_that("zap_srcref() works on calls", {
   expect_true("srcref" %in% names(attributes(call)))
 })
 
-test_that("is_dictionaryish return true if names(x) is NULL", {
-  x <- "x"
-  expect_true(is_dictionaryish(x))
+test_that("is_dictionaryish return true if is NULL", {
+
+  expect_true(is_dictionaryish(NULL))
 })