Bumped version to 0.4.1.

[sojka/company-mode.git] / company-dabbrev-code.el

diff --git a/company-dabbrev-code.el b/company-dabbrev-code.el
index 369cb05e01eb5287384f640797b117650375777e..a2efcaab553e1b28252c0c3c4adf37f70440e3a9 100644 (file)
--- a/company-dabbrev-code.el
+++ b/company-dabbrev-code.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2009 Nikolaj Schumacher
 ;;
-;; This file is part of company 0.3.1.
+;; This file is part of company 0.4.1.
 ;;
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -18,6 +18,7 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (require 'company)
+(require 'company-dabbrev)
 (eval-when-compile (require 'cl))
 
 (defcustom company-dabbrev-code-modes
@@ -35,49 +36,27 @@ Value t means complete in all modes."
   :type '(choice (repeat (symbol :tag "Major mode"))
                  (const tag "All modes" t)))
 
-(defcustom company-dabbrev-code-other-buffers .5
+(defcustom company-dabbrev-code-other-buffers t
   "*Determines whether `company-dabbrev-code' should search other buffers.
-If t, search all buffers with the same major-mode.  A numeric value means
-search other buffers for that many seconds and then return."
+If 'all, search all other buffers.  If t, search buffers with the same
+major-mode.
+See also `company-dabbrev-code-time-limit'."
   :group 'company
   :type '(choice (const :tag "Off" nil)
                  (const :tag "Same major mode" t)
-                 (number :tag "Seconds")))
+                 (const :tag "All" all)))
 
-(defun company-dabbrev-code--buffer-symbols (prefix &optional symbols
-                                            start limit)
-  (save-excursion
-    (goto-char (point-min))
-    (let ((regexp (concat "\\_<" (if (equal prefix "")
-                                     "\\([a-zA-Z]\\|\\s_\\)"
-                                   (regexp-quote prefix))
-                          "\\(\\sw\\|\\s_\\)*\\_>"))
-          (i 0)
-          match)
-      (while (re-search-forward regexp nil t)
-        (setq match (match-string-no-properties 0))
-        (unless (company-in-string-or-comment)
-          (push match symbols))
-        (and limit
-             (eq (incf i) 25)
-             (setq i 0)
-             (> (float-time (time-since start)) limit)
-             (return symbols)))
-      symbols)))
+(defcustom company-dabbrev-code-time-limit .5
+  "*Determines how long `company-dabbrev-code' should look for matches."
+  :group 'company
+  :type '(choice (const :tag "Off" nil)
+                 (number :tag "Seconds")))
 
-(defun company-dabbrev-code--symbols (prefix &optional limit)
-  (let ((start (current-time))
-        (symbols (company-dabbrev-code--buffer-symbols prefix)))
-    (dolist (buffer (delq (current-buffer) (buffer-list)))
-      (and (eq (buffer-local-value 'major-mode buffer) major-mode)
-           (with-current-buffer buffer
-             (setq symbols
-                   (company-dabbrev-code--buffer-symbols prefix symbols
-                                                        start limit))))
-      (and limit
-           (> (float-time (time-since start)) limit)
-           (return)))
-    symbols))
+(defsubst company-dabbrev-code--make-regexp (prefix)
+  (concat "\\_<" (if (equal prefix "")
+                     "\\([a-zA-Z]\\|\\s_\\)"
+                   (regexp-quote prefix))
+          "\\(\\sw\\|\\s_\\)*\\_>"))
 
 ;;;###autoload
 (defun company-dabbrev-code (command &optional arg &rest ignored)
@@ -91,13 +70,11 @@ comments or strings."
                       (apply 'derived-mode-p company-dabbrev-code-modes))
                   (not (company-in-string-or-comment))
                   (or (company-grab-symbol) 'stop)))
-    ('candidates (let ((case-fold-search nil))
-                   (if company-dabbrev-code-other-buffers
-                       (company-dabbrev-code--symbols
-                        arg
-                        (when (numberp company-dabbrev-code-other-buffers)
-                          company-dabbrev-code-other-buffers))
-                     (company-dabbrev-code--buffer-symbols arg))))
+    ('candidates (let ((completion-ignore-case nil))
+                   (company-dabbrev--search
+                    (company-dabbrev-code--make-regexp arg)
+                    company-dabbrev-code-time-limit
+                    company-dabbrev-code-other-buffers t)))
     ('duplicates t)))
 
 (provide 'company-dabbrev-code)