company-capf: strip duplicates

[gnu-emacs-elpa] / company-capf.el

diff --git a/company-capf.el b/company-capf.el
index 21b9214614a55c7ca4bf2fcbff4e1813e3222805..17ebf7cb538208b311ebbf826693fa399b660836 100644 (file)
--- a/company-capf.el
+++ b/company-capf.el
@@ -1,6 +1,6 @@
 ;;; company-capf.el --- company-mode completion-at-point-functions back-end -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2014  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 
@@ -34,7 +34,7 @@
           (data (run-hook-wrapped 'completion-at-point-functions
                                   ;; Ignore misbehaving functions.
                                   #'completion--capf-wrapper 'optimist)))
-    (when (consp data) data)))
+    (when (and (consp data) (numberp (nth 1 data))) data)))
 
 (defun company-capf (command &optional arg &rest _args)
   "`company-mode' back-end using `completion-at-point-functions'.
@@ -57,15 +57,15 @@ Requires Emacs 24.1 or newer."
                       (buffer-substring (nth 1 res) (nth 2 res))
                       table pred))
                 (sortfun (cdr (assq 'display-sort-function meta)))
-                (boundaries (completion-boundaries arg table pred ""))
                 (candidates (completion-all-completions arg table pred (length arg)))
-                (last (last candidates 1)))
-           (when (numberp (cdr last))
+                (last (last candidates))
+                (base-size (and (numberp (cdr last)) (cdr last))))
+           (when base-size
              (setcdr last nil))
            (when sortfun
              (setq candidates (funcall sortfun candidates)))
-           (if (not (zerop (car boundaries)))
-               (let ((before (substring arg 0 (car boundaries))))
+           (if (not (zerop (or base-size 0)))
+               (let ((before (substring arg 0 base-size)))
                  (mapcar (lambda (candidate)
                            (concat before candidate))
                          candidates))
@@ -77,8 +77,22 @@ Requires Emacs 24.1 or newer."
                       (buffer-substring (nth 1 res) (nth 2 res))
                       (nth 3 res) (plist-get (nthcdr 4 res) :predicate))))
            (cdr (assq 'display-sort-function meta))))))
-    (`duplicates nil) ;Don't bother.
-    (`no-cache t)     ;FIXME: Improve!
+    (`common-part
+     ;; Can't just use 0 when base-size (see above) is non-zero.
+     (let ((start (if (get-text-property 0 'face arg)
+                      0
+                    (next-single-property-change 0 'face arg))))
+       (when start
+         ;; completions-common-part comes first, but we can't just look for this
+         ;; value because it can be in a list.
+         (or
+          (let ((value (get-text-property start 'face arg)))
+            (text-property-not-all start (length arg)
+                                   'face value arg))
+          (length arg)))))
+    (`duplicates t) ;Don't bother.
+    (`no-cache t)   ;Not much can be done here, as long as we handle
+                    ;non-prefix matches.
     (`meta
      (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-docsig)))
        (when f (funcall f arg))))