;; 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
:type '(choice (const :tag "Off" nil)
(number :tag "Seconds")))
-(defmacro company-dabrev-code--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-code--make-regexp (prefix)
(concat "\\_<" (if (equal prefix "")
"\\([a-zA-Z]\\|\\s_\\)"
(regexp-quote prefix))
"\\(\\sw\\|\\s_\\)*\\_>"))
-(defun company-dabbrev-code--buffer-symbols (regexp pos &optional symbols
- start limit)
- (save-excursion
- (let (match)
- (goto-char (if pos (1- pos) (point-min)))
- ;; search before pos
- (company-dabrev-code--time-limit-while (re-search-backward regexp nil t)
- start limit
- (setq match (match-string-no-properties 0))
- (if (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-code--time-limit-while (re-search-forward regexp nil t)
- start limit
- (setq match (match-string-no-properties 0))
- (if (company-in-string-or-comment)
- (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t)
- (push match symbols)))
- symbols)))
-
-(defun company-dabbrev-code--symbols (regexp)
- (let* ((start (current-time))
- (limit company-dabbrev-code-time-limit)
- (symbols (company-dabbrev-code--buffer-symbols regexp (point) nil
- start limit)))
- (when company-dabbrev-code-other-buffers
- (dolist (buffer (delq (current-buffer) (buffer-list)))
- (and (or (eq company-dabbrev-code-other-buffers 'all)
- (eq (buffer-local-value 'major-mode buffer) major-mode))
- (with-current-buffer buffer
- (setq symbols
- (company-dabbrev-code--buffer-symbols regexp nil symbols
- start limit))))
- (and limit
- (> (float-time (time-since start)) limit)
- (return))))
- symbols))
-
;;;###autoload
(defun company-dabbrev-code (command &optional arg &rest ignored)
"A dabbrev-like `company-mode' back-end for code.
(not (company-in-string-or-comment))
(or (company-grab-symbol) 'stop)))
('candidates (let ((case-fold-search nil))
- (company-dabbrev-code--symbols
- (company-dabbrev-code--make-regexp arg))))
+ (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)
-;;; company-dabbrev.el --- a company-mode completion back-end for dabbrev
+;;; company-dabbrev.el --- a dabbrev-like company-mode completion back-end
;;
;; Copyright (C) 2009 Nikolaj Schumacher
;;
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(require 'company)
-(require 'dabbrev)
(eval-when-compile (require 'cl))
-(defun company-grab-dabbrev-prefix ()
+(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'."
+ :group 'company
+ :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."
+ :group 'company
+ :type '(choice (const :tag "Off" nil)
+ (number :tag "Seconds")))
+
+(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 "") "\\sw" (regexp-quote prefix)) "\\sw*\\>"))
+
+(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)
- "A `company-mode' completion back-end for `dabbrev-completion'."
+ "A dabbrev-like `company-mode' completion back-end."
(interactive (list 'interactive))
(case command
('interactive (company-begin-backend 'company-dabbrev))
- ('prefix (company-grab-dabbrev-prefix))
- ('candidates (let ((dabbrev-check-other-buffers))
- (dabbrev--reset-global-variables)
- (dabbrev--find-all-expansions arg t)))
- ('ignore-case t)))
+ ('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 t)
+ ('duplicates t)))
(provide 'company-dabbrev)
;;; company-dabbrev.el ends here