;; Copyright (C) 2009 Nikolaj Schumacher
;;
;; Author: Nikolaj Schumacher <bugs * nschum de>
-;; Version: 0.2.1
+;; Version: 0.3
;; Keywords: abbrev, convenience, matchis
;; URL: http://nschum.de/src/emacs/company/
;; Compatibility: GNU Emacs 22.x, GNU Emacs 23.x
;;
;;; Change Log:
;;
-;; Added abbrev back-end.
+;; 2009-04-12 (0.3)
+;; Added `company-begin-commands' option.
+;; Added abbrev, tempo and Xcode back-ends.
;; Back-ends are now interactive. You can start them with M-x backend-name.
;; Added `company-begin-with' for starting company from elisp-code.
;; Added hooks.
(function :tag "custom function" nil))))
(defcustom company-backends '(company-elisp company-nxml company-css
- company-semantic company-gtags company-etags
- company-oddmuse company-files company-dabbrev)
+ company-semantic company-xcode company-gtags
+ company-etags company-oddmuse company-files
+ company-dabbrev)
"*The list of active back-ends (completion engines).
Each back-end is a function that takes a variable number of arguments.
The first argument is the command requested from the back-end. It is one
'company-explicit-action-p)
(const :tag "On" t)))
-(defcustom company-auto-complete '(?\ ?\( ?\) ?. ?\" ?$ ?\' ?< ?| ?!)
+(defcustom company-auto-complete 'company-explicit-action-p
+ "Determines when to auto-complete.
+If this is enabled, all characters from `company-auto-complete-chars' complete
+the selected completion. This can also be a function."
+ :group 'company
+ :type '(choice (const :tag "Off" nil)
+ (function :tag "Predicate function")
+ (const :tag "On, if user interaction took place"
+ 'company-explicit-action-p)
+ (const :tag "On" t)))
+
+(defcustom company-auto-complete-chars '(?\ ?\( ?\) ?. ?\" ?$ ?\' ?< ?| ?!)
"Determines which characters trigger an automatic completion.
-If this is a function, it is called with the new input and should return non-nil
-if company should auto-complete.
+See `company-auto-complete'. If this is a string, each string character causes
+completion. If it is a list of syntax description characters (see
+`modify-char-syntax'), all characters with that syntax auto-complete.
-If this is a string, all characters in that string will complete automatically.
+This can also be a function, which is called with the new input and should
+return non-nil if company should auto-complete.
-A list of characters represent the syntax (see `modify-syntax-entry') of
-characters that complete automatically."
+A character that is part of a valid candidate never starts auto-completion."
:group 'company
- :type '(choice (const :tag "Off" nil)
- (function :tag "Predicate function")
- (string :tag "Characters")
+ :type '(choice (string :tag "Characters")
(set :tag "Syntax"
(const :tag "Whitespace" ?\ )
(const :tag "Symbol" ?_)
(const :tag "Comment ender." ?>)
(const :tag "Character-quote." ?/)
(const :tag "Generic string fence." ?|)
- (const :tag "Generic comment fence." ?!))))
+ (const :tag "Generic comment fence." ?!))
+ (function :tag "Predicate function")))
(defcustom company-idle-delay .7
"*The idle delay in seconds until automatic completions starts.
(const :tag "immediate (t)" t)
(number :tag "seconds")))
+(defcustom company-begin-commands t
+ "*A list of commands following which company will start completing.
+If this is t, it will complete after any command. See `company-idle-delay'.
+
+Alternatively any command with a non-nil 'company-begin property is treated as
+if it was on this list."
+ :group 'company
+ :type '(choice (const :tag "Any command" t)
+ (const :tag "Self insert command" '(self-insert-command))
+ (repeat :tag "Commands" function)))
+
(defcustom company-show-numbers nil
"*If enabled, show quick-access numbers for the first ten candidates."
:group 'company
(defsubst company-should-complete (prefix)
(and (eq company-idle-delay t)
+ (or (eq t company-begin-commands)
+ (memq this-command company-begin-commands)
+ (and (symbolp this-command) (get this-command 'company-begin)))
(not (and transient-mark-mode mark-active))
(>= (length prefix) company-minimum-prefix-length)))
(and company-mode
(not company-candidates)
(let ((company-idle-delay t)
- (company-minimum-prefix-length 0))
+ (company-minimum-prefix-length 0)
+ (company-begin-commands t))
(setq company--explicit-action t)
(company-begin)))
;; Return non-nil if active.
"Return non-nil, if input starts with punctuation or parentheses."
(and (> end beg)
(if (functionp company-auto-complete)
- (funcall company-auto-complete (buffer-substring beg end))
- (if (consp company-auto-complete)
- (memq (char-syntax (char-after beg)) company-auto-complete)
+ (funcall company-auto-complete)
+ company-auto-complete)
+ (if (functionp company-auto-complete-chars)
+ (funcall company-auto-complete-chars (buffer-substring beg end))
+ (if (consp company-auto-complete-chars)
+ (memq (char-syntax (char-after beg)) company-auto-complete-chars)
(string-match (buffer-substring beg (1+ beg))
- company-auto-complete)))))
+ company-auto-complete-chars)))))
(defun company-continue ()
(when company-candidates
"Complete the common part of all candidates."
(interactive)
(when (company-manual-begin)
- (if (equal company-common (car company-candidates))
- ;; for success message
+ (if (and (not (cdr company-candidates))
+ (equal company-common (car company-candidates)))
(company-complete-selection)
(insert (company-strip-prefix company-common)))))