X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/4f78548ad62f25816529bb117c9721108daa3f1c..9b89556880e326ec3391cfda2a87eada101eaaae:/company-etags.el
diff --git a/company-etags.el b/company-etags.el
index 820ffeee1..ef53213ba 100644
--- a/company-etags.el
+++ b/company-etags.el
@@ -1,53 +1,71 @@
-;;; company-etags.el --- a company-mode completion back-end for etags
-;;
-;; Copyright (C) 2009 Nikolaj Schumacher
-;;
-;; This file is part of company 0.3.
-;;
-;; 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-etags.el --- company-mode completion backend for etags
+
+;; Copyright (C) 2009-2011, 2014 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)
-(eval-when-compile (require 'etags))
-(eval-when-compile (require 'cl))
+(require 'cl-lib)
+(require 'etags)
+
+(defgroup company-etags nil
+ "Completion backend for etags."
+ :group 'company)
(defcustom company-etags-use-main-table-list t
- "*Always search `tags-table-list' if set.
+ "Always search `tags-table-list' if set.
If this is disabled, `company-etags' will try to find the one table for each
buffer automatically."
- :group 'company-mode
:type '(choice (const :tag "off" nil)
(const :tag "on" t)))
-(defvar company-etags-symbol-regexp
- "\\_<[A-Za-z_][A-Za-z_0-9]*\\_>")
+(defcustom company-etags-ignore-case nil
+ "Non-nil to ignore case in completion candidates."
+ :type 'boolean
+ :package-version '(company . "0.7.3"))
+
+(defcustom company-etags-everywhere nil
+ "Non-nil to offer completions in comments and strings.
+Set it to t or to a list of major modes."
+ :type '(choice (const :tag "Off" nil)
+ (const :tag "Any supported mode" t)
+ (repeat :tag "Some major modes"
+ (symbol :tag "Major mode")))
+ :package-version '(company . "0.9.0"))
-(defvar company-etags-modes '(c-mode objc-mode c++-mode java-mode jde-mode
- pascal-mode perl-mode python-mode))
+(defvar company-etags-modes '(prog-mode c-mode objc-mode c++-mode java-mode
+ jde-mode pascal-mode perl-mode python-mode))
-(defvar company-etags-buffer-table 'unknown)
-(make-variable-buffer-local 'company-etags-buffer-table)
+(defvar-local company-etags-buffer-table 'unknown)
(defun company-etags-find-table ()
- (let ((dir (if buffer-file-name
- (file-name-directory buffer-file-name)
- (expand-file-name default-directory)))
- file)
- (while (not (or file (equal dir "/")))
- (unless (file-exists-p (setq file (expand-file-name "TAGS" dir)))
- (setq file nil
- dir (file-name-directory (directory-file-name dir)))))
- (when file
+ (let ((file (expand-file-name
+ "TAGS"
+ (locate-dominating-file (or buffer-file-name
+ default-directory)
+ "TAGS"))))
+ (when (and file (file-regular-p file))
(list file))))
(defun company-etags-buffer-table ()
@@ -56,30 +74,34 @@ buffer automatically."
(setq company-etags-buffer-table (company-etags-find-table))
company-etags-buffer-table)))
+(defun company-etags--candidates (prefix)
+ (let ((tags-table-list (company-etags-buffer-table))
+ (completion-ignore-case company-etags-ignore-case))
+ (and (or tags-file-name tags-table-list)
+ (fboundp 'tags-completion-table)
+ (save-excursion
+ (visit-tags-table-buffer)
+ (all-completions prefix (tags-completion-table))))))
+
;;;###autoload
(defun company-etags (command &optional arg &rest ignored)
- "A `company-mode' completion back-end for etags."
+ "`company-mode' completion backend for etags."
(interactive (list 'interactive))
- (case command
- ('interactive (company-begin-backend 'company-etags))
- ('prefix (and (memq major-mode company-etags-modes)
- (not (company-in-string-or-comment))
- (require 'etags nil t)
- (company-etags-buffer-table)
- (or (company-grab company-etags-symbol-regexp) "")))
- ('candidates (let ((tags-table-list (company-etags-buffer-table))
- (completion-ignore-case nil))
- (and (fboundp 'tags-completion-table)
- (all-completions arg (tags-completion-table)))))
- ('location (let ((tags-table-list (company-etags-buffer-table)))
- (when (fboundp 'find-tag-noselect)
- (let ((buffer (find-tag-noselect arg)))
- (cons buffer (with-current-buffer buffer (point)))))))
- ('sorted t)))
-
-(add-to-list 'company-backends 'company-etags)
+ (cl-case command
+ (interactive (company-begin-backend 'company-etags))
+ (prefix (and (apply #'derived-mode-p company-etags-modes)
+ (or (eq t company-etags-everywhere)
+ (apply #'derived-mode-p company-etags-everywhere)
+ (not (company-in-string-or-comment)))
+ (company-etags-buffer-table)
+ (or (company-grab-symbol) 'stop)))
+ (candidates (company-etags--candidates arg))
+ (location (let ((tags-table-list (company-etags-buffer-table)))
+ (when (fboundp 'find-tag-noselect)
+ (save-excursion
+ (let ((buffer (find-tag-noselect arg)))
+ (cons buffer (with-current-buffer buffer (point))))))))
+ (ignore-case company-etags-ignore-case)))
(provide 'company-etags)
;;; company-etags.el ends here
-
-