X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/7cb38f2a04e068fe36002148f3b1963f906decf4..9fad54d2f69f1a2e38cc475612bf475097bcfe40:/company-dabbrev.el
diff --git a/company-dabbrev.el b/company-dabbrev.el
index ecd8610f8..afe60f2a9 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -1,41 +1,130 @@
-;;; company-dabbrev.el --- a company-mode completion back-end for dabbrev
-;;
-;; Copyright (C) 2009 Nikolaj Schumacher
-;;
-;; This file is part of company.
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 2
-;; of the License, or (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;;; company-dabbrev.el --- dabbrev-like company-mode completion back-end
+
+;; Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see .
+;; along with GNU Emacs. If not, see .
+
+
+;;; Commentary:
+;;
+
+;;; Code:
(require 'company)
-(require 'dabbrev)
(eval-when-compile (require 'cl))
-(defun company-grab-dabbrev-prefix ()
+(defgroup company-dabbrev nil
+ "dabbrev-like completion back-end."
+ :group 'company)
+
+(defcustom company-dabbrev-other-buffers 'all
+ "Determines whether `company-dabbrev' should search other buffers.
+If `all', search all other buffers. If t, search buffers with the same
+major mode.
+See also `company-dabbrev-time-limit'."
+ :type '(choice (const :tag "Off" nil)
+ (const :tag "Same major mode" t)
+ (const :tag "All" all)))
+
+(defcustom company-dabbrev-time-limit .5
+ "Determines how many seconds `company-dabbrev' should look for matches."
+ :type '(choice (const :tag "Off" nil)
+ (number :tag "Seconds")))
+
+(defcustom company-dabbrev-char-regexp "\\sw"
+ "A regular expression matching the characters `company-dabbrev' looks for."
+ :type 'regexp)
+
+(defcustom company-dabbrev-ignore-case 'keep-prefix
+ "The value of `ignore-case' returned by `company-dabbrev'.")
+
+(defmacro company-dabrev--time-limit-while (test start limit &rest body)
+ (declare (indent 3) (debug t))
+ `(let ((company-time-limit-while-counter 0))
+ (catch 'done
+ (while ,test
+ ,@body
+ (and ,limit
+ (eq (incf company-time-limit-while-counter) 25)
+ (setq company-time-limit-while-counter 0)
+ (> (float-time (time-since ,start)) ,limit)
+ (throw 'done 'company-time-out))))))
+
+(defsubst company-dabbrev--make-regexp (prefix)
+ (concat "\\<" (if (equal prefix "")
+ company-dabbrev-char-regexp
+ (regexp-quote prefix))
+ "\\(" company-dabbrev-char-regexp "\\)*\\>"))
+
+(defun company-dabbrev--search-buffer (regexp pos symbols start limit
+ ignore-comments)
(save-excursion
- (when (looking-at "\\>")
- (let ((end (point)))
- (dabbrev--reset-global-variables)
- (dabbrev--goto-start-of-abbrev)
- (buffer-substring-no-properties (point) end)))))
+ (let (match)
+ (goto-char (if pos (1- pos) (point-min)))
+ ;; search before pos
+ (company-dabrev--time-limit-while (re-search-backward regexp nil t)
+ start limit
+ (setq match (match-string-no-properties 0))
+ (if (and ignore-comments (company-in-string-or-comment))
+ (re-search-backward "\\s<\\|\\s!\\|\\s\"\\|\\s|" nil t)
+ (push match symbols)))
+ (goto-char (or pos (point-min)))
+ ;; search after pos
+ (company-dabrev--time-limit-while (re-search-forward regexp nil t)
+ start limit
+ (setq match (match-string-no-properties 0))
+ (if (and ignore-comments (company-in-string-or-comment))
+ (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t)
+ (push match symbols)))
+ symbols)))
+
+(defun company-dabbrev--search (regexp &optional limit other-buffers
+ ignore-comments)
+ (let* ((start (current-time))
+ (symbols (company-dabbrev--search-buffer regexp (point) nil start limit
+ ignore-comments)))
+ (when other-buffers
+ (dolist (buffer (delq (current-buffer) (buffer-list)))
+ (and (or (eq other-buffers 'all)
+ (eq (buffer-local-value 'major-mode buffer) major-mode))
+ (with-current-buffer buffer
+ (setq symbols
+ (company-dabbrev--search-buffer regexp nil symbols start
+ limit ignore-comments))))
+ (and limit
+ (> (float-time (time-since start)) limit)
+ (return))))
+ symbols))
+;;;###autoload
(defun company-dabbrev (command &optional arg &rest ignored)
+ "dabbrev-like `company-mode' completion back-end."
+ (interactive (list 'interactive))
(case command
- ('prefix (company-grab-dabbrev-prefix))
- ('candidates (let ((dabbrev-check-other-buffers))
- (dabbrev--reset-global-variables)
- (dabbrev--find-all-expansions arg t)))
- ('ignore-case t)))
+ (interactive (company-begin-backend 'company-dabbrev))
+ (prefix (company-grab-word))
+ (candidates
+ (mapcar 'downcase
+ (company-dabbrev--search (company-dabbrev--make-regexp arg)
+ company-dabbrev-time-limit
+ company-dabbrev-other-buffers)))
+ (ignore-case company-dabbrev-ignore-case)
+ (duplicates t)))
(provide 'company-dabbrev)
;;; company-dabbrev.el ends here