Handle empty list of candidates

diff --git a/company.el b/company.el
index 8d416de92381b1720f73dee8595648e7c37d71e4..498920afbf414bfc99a94d76251987f6156bfe48 100644 (file)
--- a/company.el
+++ b/company.el
@@ -1239,7 +1239,7 @@ can retrieve meta-data for them."
           (push anno2 annos)
           (push str res)            ; Maintain ordering.
           (setq str str2)))))
-    (push str res)
+    (when str (push str res))
     (nreverse res)))
 
 (defun company--transform-candidates (candidates)

diff --git a/test/core-tests.el b/test/core-tests.el
index dcadfd3ab70f6f74d5da8fe592948748a251ebe4..46d17093b2682057a84576664cdf05e44f9c99a3 100644 (file)
--- a/test/core-tests.el
+++ b/test/core-tests.el
@@ -399,6 +399,9 @@
       (and (ert-equal-including-properties (car list1) (car list2))
            (ct-equal-including-properties (cdr list1) (cdr list2)))))
 
+(ert-deftest company-strips-duplicates-returns-nil ()
+  (should (null (company--preprocess-candidates nil))))
+
 (ert-deftest company-strips-duplicates-within-groups ()
   (let* ((kvs '(("a" . "b")
                 ("a" . nil)