X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/a5a6eeecf0ac9bda696091ab2a88a573f2fe3fd4..e52579348d8529b0cff08a1f0a676cb0cc6f61c3:/company-dabbrev.el diff --git a/company-dabbrev.el b/company-dabbrev.el index 3d57bb5c2..85741f203 100644 --- a/company-dabbrev.el +++ b/company-dabbrev.el @@ -1,6 +1,6 @@ -;;; company-dabbrev.el --- dabbrev-like company-mode completion back-end -*- lexical-binding: t -*- +;;; company-dabbrev.el --- dabbrev-like company-mode completion backend -*- lexical-binding: t -*- -;; Copyright (C) 2009, 2011, 2014 Free Software Foundation, Inc. +;; Copyright (C) 2009, 2011, 2014, 2015, 2016 Free Software Foundation, Inc. ;; Author: Nikolaj Schumacher @@ -29,18 +29,21 @@ (require 'cl-lib) (defgroup company-dabbrev nil - "dabbrev-like completion back-end." + "dabbrev-like completion backend." :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'." +If `all', search all other buffers, except the ignored ones. 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-ignore-buffers "\\`[ *]" + "Regexp matching the names of buffers to ignore." + :type 'regexp) + (defcustom company-dabbrev-time-limit .1 "Determines how many seconds `company-dabbrev' should look for matches." :type '(choice (const :tag "Off" nil) @@ -51,7 +54,9 @@ See also `company-dabbrev-time-limit'." :type 'regexp) (defcustom company-dabbrev-ignore-case 'keep-prefix - "The value of `ignore-case' returned by `company-dabbrev'.") + "Non-nil to ignore case when collecting completion candidates. +When it's `keep-prefix', the text before point will remain unchanged after +candidate is inserted, even some of its characters have different case.") (defcustom company-dabbrev-downcase 'case-replace "Whether to downcase the returned candidates. @@ -63,50 +68,66 @@ Any other value means downcase. If you set this value to nil, you may also want to set `company-dabbrev-ignore-case' to any value other than `keep-prefix'.") -(defcustom company-dabbrev-minimum-length (1+ company-minimum-prefix-length) - "The minimum length for the string to be included." - :type 'integer) +(defcustom company-dabbrev-minimum-length 4 + "The minimum length for the completion candidate to be included. +This variable affects both `company-dabbrev' and `company-dabbrev-code'." + :type 'integer + :package-version '(company . "0.8.3")) + +(defcustom company-dabbrev-ignore-invisible nil + "Non-nil to skip invisible text." + :type 'boolean + :package-version '(company . "0.9.0")) -(defmacro company-dabrev--time-limit-while (test start limit &rest body) +(defmacro company-dabrev--time-limit-while (test start limit freq &rest body) (declare (indent 3) (debug t)) `(let ((company-time-limit-while-counter 0)) (catch 'done (while ,test ,@body (and ,limit - (eq (cl-incf company-time-limit-while-counter) 25) + (= (cl-incf company-time-limit-while-counter) ,freq) (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--make-regexp () + (concat "\\(?:" company-dabbrev-char-regexp "\\)+")) (defun company-dabbrev--search-buffer (regexp pos symbols start limit ignore-comments) (save-excursion - (let (match) + (cl-labels ((maybe-collect-match + () + (let ((match (match-string-no-properties 0))) + (when (and (>= (length match) company-dabbrev-minimum-length) + (not (and company-dabbrev-ignore-invisible + (invisible-p (match-beginning 0))))) + (push match symbols))))) (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)) - (goto-char (nth 8 (syntax-ppss))) - (when (>= (length match) company-dabbrev-minimum-length) - (push match symbols)))) + ;; Search before pos. + (let ((tmp-end (point))) + (company-dabrev--time-limit-while (> tmp-end (point-min)) + start limit 1 + (ignore-errors + (forward-char -10000)) + (forward-line 0) + (save-excursion + ;; Before, we used backward search, but it matches non-greedily, and + ;; that forced us to use the "beginning/end of word" anchors in + ;; `company-dabbrev--make-regexp'. It's also about 2x slower. + (while (re-search-forward regexp tmp-end t) + (if (and ignore-comments (save-match-data (company-in-string-or-comment))) + (re-search-forward "\\s>\\|\\s!\\|\\s\"" tmp-end t) + (maybe-collect-match)))) + (setq tmp-end (point)))) (goto-char (or pos (point-min))) - ;; search after pos + ;; 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)) + start limit 25 + (if (and ignore-comments (save-match-data (company-in-string-or-comment))) (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t) - (when (>= (length match) company-dabbrev-minimum-length) - (push match symbols)))) + (maybe-collect-match))) symbols))) (defun company-dabbrev--search (regexp &optional limit other-buffer-modes @@ -117,8 +138,10 @@ If you set this value to nil, you may also want to set (when other-buffer-modes (cl-dolist (buffer (delq (current-buffer) (buffer-list))) (with-current-buffer buffer - (when (or (eq other-buffer-modes 'all) - (apply #'derived-mode-p other-buffer-modes)) + (when (if (eq other-buffer-modes 'all) + (not (string-match-p company-dabbrev-ignore-buffers + (buffer-name))) + (apply #'derived-mode-p other-buffer-modes)) (setq symbols (company-dabbrev--search-buffer regexp nil symbols start limit ignore-comments)))) @@ -127,22 +150,36 @@ If you set this value to nil, you may also want to set (cl-return)))) symbols)) +(defun company-dabbrev--prefix () + ;; Not in the middle of a word. + (unless (looking-at company-dabbrev-char-regexp) + ;; Emacs can't do greedy backward-search. + (company-grab-line (format "\\(?:^\\| \\)[^ ]*?\\(\\(?:%s\\)*\\)" + company-dabbrev-char-regexp) + 1))) + +(defun company-dabbrev--filter (prefix candidates) + (let ((completion-ignore-case company-dabbrev-ignore-case)) + (all-completions prefix candidates))) + ;;;###autoload (defun company-dabbrev (command &optional arg &rest ignored) - "dabbrev-like `company-mode' completion back-end." + "dabbrev-like `company-mode' completion backend." (interactive (list 'interactive)) (cl-case command (interactive (company-begin-backend 'company-dabbrev)) - (prefix (company-grab-word)) + (prefix (company-dabbrev--prefix)) (candidates - (let ((words (company-dabbrev--search (company-dabbrev--make-regexp arg) - company-dabbrev-time-limit - (pcase company-dabbrev-other-buffers - (`t (list major-mode)) - (`all `all)))) - (downcase-p (if (eq company-dabbrev-downcase 'case-replace) - case-replace - company-dabbrev-downcase))) + (let* ((case-fold-search company-dabbrev-ignore-case) + (words (company-dabbrev--search (company-dabbrev--make-regexp) + company-dabbrev-time-limit + (pcase company-dabbrev-other-buffers + (`t (list major-mode)) + (`all `all)))) + (downcase-p (if (eq company-dabbrev-downcase 'case-replace) + case-replace + company-dabbrev-downcase))) + (setq words (company-dabbrev--filter arg words)) (if downcase-p (mapcar 'downcase words) words)))