X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/0be25795c6746f8f2a16e1381f7bfadb688e4b9e..d2587c44cefd96b52a27bbc296cb8156eb2ad773:/company-dabbrev-code.el
diff --git a/company-dabbrev-code.el b/company-dabbrev-code.el
index f348a18af..e4c548ef0 100644
--- a/company-dabbrev-code.el
+++ b/company-dabbrev-code.el
@@ -1,105 +1,89 @@
-;;; company-dabbrev-code.el --- a dabbrev-like company-mode back-end for code
-;;
-;; Copyright (C) 2009 Nikolaj Schumacher
-;;
-;; This file is part of company 0.3.1.
-;;
-;; 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-code.el --- dabbrev-like company-mode back-end for code
+
+;; 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 'company-dabbrev)
(eval-when-compile (require 'cl))
+(defgroup company-dabbrev-code nil
+ "dabbrev-like completion back-end for code."
+ :group 'company)
+
(defcustom company-dabbrev-code-modes
'(asm-mode batch-file-mode c++-mode c-mode cperl-mode csharp-mode css-mode
- emacs-lisp-mode erlang-mode espresso-mode f90-mode fortran-mode
- haskell-mode java-mode javascript-mode jde-mode js2-mode lisp-mode
- lua-mode objc-mode perl-mode php-mode python-mode ruby-mode scheme-mode
- shell-script-mode)
- "*Modes that use `company-dabbrev-code'.
+ emacs-lisp-mode erlang-mode f90-mode fortran-mode haskell-mode java-mode
+ javascript-mode jde-mode js2-mode lisp-mode lua-mode objc-mode perl-mode
+ php-mode prog-mode python-mode ruby-mode scheme-mode shell-script-mode)
+ "Modes that use `company-dabbrev-code'.
In all these modes `company-dabbrev-code' will complete only symbols, not text
in comments or strings. In other modes `company-dabbrev-code' will pass control
to other back-ends \(e.g. `company-dabbrev'\).
Value t means complete in all modes."
- :group 'company
:type '(choice (repeat (symbol :tag "Major mode"))
(const tag "All modes" t)))
-(defcustom company-dabbrev-code-other-buffers .5
- "*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."
- :group 'company
+(defcustom company-dabbrev-code-other-buffers t
+ "Determines whether `company-dabbrev-code' should search other buffers.
+If `all', search all other buffers. If t, search buffers with the same
+major mode.
+See also `company-dabbrev-code-time-limit'."
:type '(choice (const :tag "Off" nil)
(const :tag "Same major mode" t)
+ (const :tag "All" all)))
+
+(defcustom company-dabbrev-code-time-limit .5
+ "Determines how long `company-dabbrev-code' should look for matches."
+ :type '(choice (const :tag "Off" nil)
(number :tag "Seconds")))
-(defun company-dabbrev-code--buffer-symbols (prefix pos &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 (or (eq (match-end 0) pos) ;; ignore match before point
- (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)))
-
-(defun company-dabbrev-code--symbols (prefix &optional limit)
- (let ((start (current-time))
- (symbols (company-dabbrev-code--buffer-symbols prefix (point))))
- (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 nil 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)
- "A dabbrev-like `company-mode' back-end for code.
+ "dabbrev-like `company-mode' back-end for code.
The back-end looks for all symbols in the current buffer that aren't in
comments or strings."
(interactive (list 'interactive))
(case command
- ('interactive (company-begin-backend 'company-dabbrev-code))
- ('prefix (and (or (eq t company-dabbrev-code-modes)
- (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 (point)))))
- ('duplicates t)))
+ (interactive (company-begin-backend 'company-dabbrev-code))
+ (prefix (and (or (eq t company-dabbrev-code-modes)
+ (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))
+ (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-code.el ends here