Change index-of to return nil if value not found

This makes it consistent with clojure.string/index-of.
weavejester · Oct 18, 2024 · b2dd5d0 · b2dd5d0
1 parent 923d478
commit b2dd5d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/medley/core.cljc b/src/medley/core.cljc
@@ -661,9 +661,9 @@
 
 (defn index-of
   "Returns the index of the first occurrence of the item in the sequential
-  collection coll, or -1 if not found."
+  collection coll, or nil if not found."
   {:added "1.9.0"}
   [^java.util.List coll item]
-  (if (nil? coll)
-    -1
-    (.indexOf coll item)))
+  (when (some? coll)
+    (let [index (.indexOf coll item)]
+      (when-not (neg? index) index))))
diff --git a/test/medley/core_test.cljc b/test/medley/core_test.cljc
@@ -504,12 +504,12 @@
   (is (not (m/regexp? nil))))
 
 (deftest test-index-of
-  (is (= -1 (m/index-of nil :a)))
-  (is (= -1 (m/index-of [] :a)))
-  (is (= -1 (m/index-of '() :a)))
+  (is (nil? (m/index-of nil :a)))
+  (is (nil? (m/index-of [] :a)))
+  (is (nil? (m/index-of '() :a)))
 
-  (is (= -1 (m/index-of  [:a] :b)))
-  (is (= -1 (m/index-of '(:a) :b)))
+  (is (nil? (m/index-of  [:a] :b)))
+  (is (nil? (m/index-of '(:a) :b)))
 
   (is (= 1 (m/index-of  [:a :b :c :d] :b)))
   (is (= 2 (m/index-of '(:a :b :c :d) :c)))