;;; company.el --- Modular in-buffer completion framework -*- lexical-binding: t -*-
-;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2014 Free Software Foundation, Inc.
;; Author: Nikolaj Schumacher
;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
-;; Version: 0.6.9
+;; Version: 0.6.13
;; Keywords: abbrev, convenience, matching
;; URL: http://company-mode.github.io/
;; Compatibility: GNU Emacs 22.x, GNU Emacs 23.x, GNU Emacs 24.x
If this many lines are not available, prefer to display the tooltip above."
:type 'integer)
+(defcustom company-tooltip-margin 1
+ "Width of margin columns to show around the toolip."
+ :type 'integer)
+
(defvar company-safe-backends
'((company-abbrev . "Abbrev")
(company-capf . "completion-at-point-functions")
(company-clang . "Clang")
+ (company-cmake . "CMake")
(company-css . "CSS")
(company-dabbrev . "dabbrev for plain text")
(company-dabbrev-code . "dabbrev for code")
(assq backend company-safe-backends))
(return t))))))
-(defcustom company-backends '(company-elisp company-nxml company-css
- company-semantic company-clang company-eclim
- company-xcode company-ropemacs
+(defvar company--include-capf (version< "24.3.50" emacs-version))
+
+(defcustom company-backends `(,@(unless company--include-capf
+ (list 'company-elisp))
+ company-nxml company-css
+ company-eclim company-semantic company-clang
+ company-xcode company-ropemacs company-cmake
+ ,@(when company--include-capf
+ (list 'company-capf))
(company-gtags company-etags company-dabbrev-code
company-keywords)
company-oddmuse company-files company-dabbrev)
The first argument is the command requested from the back-end. It is one
of the following:
-`prefix': The back-end should return the text to be completed. It must be text
-immediately before point. Returning nil passes control to the next back-end.
-The function should return `stop' if it should complete but cannot \(e.g. if it
-is in the middle of a string\). Instead of a string, the back-end may return a
-cons where car is the prefix and cdr is used in `company-minimum-prefix-length'
-test. It's either number or t, in which case the test automatically succeeds.
+`prefix': The back-end should return the text to be completed. It must be
+text immediately before point. Returning nil passes control to the next
+back-end. The function should return `stop' if it should complete but
+cannot \(e.g. if it is in the middle of a string\). Instead of a string,
+the back-end may return a cons where car is the prefix and cdr is used in
+`company-minimum-prefix-length' test. It's either number or t, in which
+case the test automatically succeeds.
`candidates': The second argument is the prefix to be completed. The
return value should be a list of candidates that start with the prefix.
Optional commands:
-`sorted': The back-end may return t here to indicate that the candidates
-are sorted and will not need to be sorted again.
+`sorted': Return t here to indicate that the candidates are sorted and will
+not need to be sorted again.
`duplicates': If non-nil, company will take care of removing duplicates
from the list.
progresses, unless the back-end returns t for this command. The second
argument is the latest prefix.
-`meta': The second argument is a completion candidate. The back-end should
-return a (short) documentation string for it.
+`meta': The second argument is a completion candidate. Return a (short)
+documentation string for it.
-`doc-buffer': The second argument is a completion candidate.
-The back-end should create a buffer (preferably with `company-doc-buffer'),
-fill it with documentation and return it.
+`doc-buffer': The second argument is a completion candidate. Return a
+buffer with documentation for it. Preferably use `company-doc-buffer',
-`location': The second argument is a completion candidate. The back-end can
-return the cons of buffer and buffer location, or of file and line
-number where the completion candidate was defined.
+`location': The second argument is a completion candidate. Return the cons
+of buffer and buffer location, or of file and line number where the
+completion candidate was defined.
-`require-match': If this value is t, the user is not allowed to enter anything
-not offered as a candidate. Use with care! The default value nil gives the
-user that choice with `company-require-match'. Return value 'never overrides
-that option the other way around.
+`require-match': If this returns t, the user is not allowed to enter
+anything not offered as a candidate. Use with care! The default value nil
+gives the user that choice with `company-require-match'. Return value
+`never' overrides that option the other way around.
-`init': Called once for each buffer, the back-end can check for external
-programs and files and load any required libraries. Raising an error here will
-show up in message log once, and the backend will not be used for completion.
+`init': Called once for each buffer. The back-end can check for external
+programs and files and load any required libraries. Raising an error here
+will show up in message log once, and the back-end will not be used for
+completion.
-`post-completion': Called after a completion candidate has been inserted into
-the buffer. The second argument is the candidate. Can be used to modify it,
-e.g. to expand a snippet.
+`post-completion': Called after a completion candidate has been inserted
+into the buffer. The second argument is the candidate. Can be used to
+modify it, e.g. to expand a snippet.
The back-end should return nil for all commands it does not support or
does not know about. It should also be callable interactively and use
"Hook run when company successfully completes.
The hook is called with the selected candidate as an argument.
-If you indend to use it to post-process candidates from a specific back-end,
-consider using the `post-completion' command instead."
+If you indend to use it to post-process candidates from a specific
+back-end, consider using the `post-completion' command instead."
:type 'hook)
(defcustom company-minimum-prefix-length 3
- "The minimum prefix length for automatic completion."
+ "The minimum prefix length for idle completion."
:type '(integer :tag "prefix length"))
(defcustom company-require-match 'company-explicit-action-p
(defcustom company-auto-complete nil
"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."
+If this is enabled, all characters from `company-auto-complete-chars'
+trigger insertion of the selected completion candidate.
+This can also be a function."
:type '(choice (const :tag "Off" nil)
(function :tag "Predicate function")
(const :tag "On, if user interaction took place"
(const :tag "On" t)))
(defcustom company-auto-complete-chars '(?\ ?\) ?.)
- "Determines which characters trigger an automatic completion.
-See `company-auto-complete'. If this is a string, each string character causes
-completion. If it is a list of syntax description characters (see
+ "Determines which characters trigger auto-completion.
+See `company-auto-complete'. If this is a string, each string character
+tiggers auto-completion. If it is a list of syntax description characters (see
`modify-syntax-entry'), all characters with that syntax auto-complete.
This can also be a function, which is called with the new input and should
(function :tag "Predicate function")))
(defcustom company-idle-delay .7
- "The idle delay in seconds until automatic completions starts.
-A value of nil means never complete automatically, t means complete
+ "The idle delay in seconds until completion starts automatically.
+A value of nil means no idle completion, t means show candidates
immediately when a prefix of `company-minimum-prefix-length' is reached."
:type '(choice (const :tag "never (nil)" nil)
(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'.
+(defcustom company-begin-commands '(self-insert-command)
+ "A list of commands after which idle completion is allowed.
+If this is t, it can show completions 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."
+Alternatively, any command with a non-nil `company-begin' property is
+treated as if it was on this list."
:type '(choice (const :tag "Any command" t)
(const :tag "Self insert command" '(self-insert-command))
(repeat :tag "Commands" function)))
:type '(choice (const :tag "off" nil)
(const :tag "on" t)))
+(defcustom company-selection-wrap-around nil
+ "If enabled, selecting item before first or after last wraps around."
+ :type '(choice (const :tag "off" nil)
+ (const :tag "on" t)))
+
(defvar company-end-of-buffer-workaround t
"Work around a visualization bug when completing at the end of the buffer.
The work-around consists of adding a newline.")
`company-filter-candidates'. These can be used while completion is
inactive, as well.
-The completion data is retrieved using `company-backends' and displayed using
-`company-frontends'. If you want to start a specific back-end, call it
-interactively or use `company-begin-backend'.
+The completion data is retrieved using `company-backends' and displayed
+using `company-frontends'. If you want to start a specific back-end, call
+it interactively or use `company-begin-backend'.
regular keymap (`company-mode-map'):
(company-cancel)
(kill-local-variable 'company-point)))
+(defcustom company-global-modes t
+ "Modes for which `company-mode' mode is turned on by `global-company-mode'.
+If nil, means no modes. If t, then all major modes have it turned on.
+If a list, it should be a list of `major-mode' symbol names for which
+`company-mode' should be automatically turned on. The sense of the list is
+negated if it begins with `not'. For example:
+ (c-mode c++-mode)
+means that `company-mode' is turned on for buffers in C and C++ modes only.
+ (not message-mode)
+means that `company-mode' is always turned on except in `message-mode' buffers."
+ :type '(choice (const :tag "none" nil)
+ (const :tag "all" t)
+ (set :menu-tag "mode specific" :tag "modes"
+ :value (not)
+ (const :tag "Except" not)
+ (repeat :inline t (symbol :tag "mode")))))
+
;;;###autoload
(define-globalized-minor-mode global-company-mode company-mode company-mode-on)
(defun company-mode-on ()
- (unless (or noninteractive (eq (aref (buffer-name) 0) ?\s))
+ (when (and (not (or noninteractive (eq (aref (buffer-name) 0) ?\s)))
+ (cond ((eq company-global-modes t)
+ t)
+ ((eq (car-safe company-global-modes) 'not)
+ (not (memq major-mode (cdr company-global-modes))))
+ (t (memq major-mode company-global-modes))))
(company-mode 1)))
(defsubst company-assert-enabled ()
(defun company--column (&optional pos)
(save-excursion
(when pos (goto-char pos))
- (let ((pt (point)))
- (save-restriction
- (+ (save-excursion
- (vertical-motion 0)
- (narrow-to-region (point) pt)
- (let ((prefix (get-text-property (point) 'line-prefix)))
- (if prefix (length prefix) 0)))
- (current-column))))))
+ (save-restriction
+ (+ (save-excursion
+ (vertical-motion 0)
+ (narrow-to-region (point) (point-max))
+ (let ((prefix (get-text-property (point) 'line-prefix)))
+ (if prefix (length prefix) 0)))
+ (current-column)))))
(defun company--row (&optional pos)
(save-excursion
(make-variable-buffer-local 'company--explicit-action)
(defvar company--auto-completion nil
- "Non-nil when current candidate is being completed automatically.
+ "Non-nil when current candidate is being inserted automatically.
Controlled by `company-auto-complete'.")
(defvar company--point-max nil)
(defsubst company-strip-prefix (str)
(substring str (length company-prefix)))
+(defun company--insert-candidate (candidate)
+ ;; XXX: Return value we check here is subject to change.
+ (set-text-properties 0 (length candidate) nil candidate)
+ (if (eq (company-call-backend 'ignore-case) 'keep-prefix)
+ (insert (company-strip-prefix candidate))
+ (delete-region (- (point) (length company-prefix)) (point))
+ (insert candidate)))
+
(defmacro company-with-candidate-inserted (candidate &rest body)
"Evaluate BODY with CANDIDATE temporarily inserted.
This is a tool for back-ends that need candidates inserted before they
`(let ((inhibit-modification-hooks t)
(inhibit-point-motion-hooks t)
(modified-p (buffer-modified-p)))
- (insert (company-strip-prefix ,candidate))
+ (company--insert-candidate ,candidate)
(unwind-protect
(progn ,@body)
(delete-region company-point (point)))))
(defun company-reformat (candidate)
;; company-ispell needs this, because the results are always lower-case
;; It's mory efficient to fix it only when they are displayed.
- (concat company-prefix (substring candidate (length company-prefix))))
+ ;; FIXME: Adopt the current text's capitalization instead?
+ (if (eq (company-call-backend 'ignore-case) 'keep-prefix)
+ (concat company-prefix (substring candidate (length company-prefix)))
+ candidate))
(defun company--should-complete ()
(and (not (or buffer-read-only overriding-terminal-local-map
- overriding-local-map
- (minibufferp)))
+ overriding-local-map))
;; Check if in the middle of entering a key combination.
(or (equal (this-command-keys-vector) [])
(not (keymapp (key-binding (this-command-keys-vector)))))
frontend (error-message-string err) command)))))
(defun company-set-selection (selection &optional force-update)
- (setq selection (max 0 (min (1- company-candidates-length) selection)))
+ (setq selection
+ (if company-selection-wrap-around
+ (mod selection company-candidates-length)
+ (max 0 (min (1- company-candidates-length) selection))))
(when (or force-update (not (equal selection company-selection)))
(setq company-selection selection
company-selection-changed t)
(push (cons company-prefix company-candidates) company-candidates-cache)
;; Calculate common.
(let ((completion-ignore-case (company-call-backend 'ignore-case)))
- (setq company-common (company--safe-candidate
- (try-completion company-prefix company-candidates))))
- (when (eq company-common t)
- (setq company-candidates nil)))
+ ;; We want to support non-prefix completion, so filtering is the
+ ;; responsibility of each respective backend, not ours.
+ ;; On the other hand, we don't want to replace non-prefix input in
+ ;; `company-complete-common'.
+ (setq company-common
+ (if (cdr company-candidates)
+ (company--safe-candidate
+ (try-completion company-prefix company-candidates))
+ (car company-candidates)))))
(defun company--safe-candidate (str)
(or (company-call-backend 'crop str)
(setq company-point (point)))
(defun company-finish (result)
- (insert (company-strip-prefix result))
+ (company--insert-candidate result)
(company-cancel result)
;; Don't start again, unless started manually.
(setq company-point (point)))
Regular characters are appended to the search string.
-The command `company-search-kill-others' (\\[company-search-kill-others]) uses
- the search string to limit the completion candidates."
+The command `company-search-kill-others' (\\[company-search-kill-others])
+uses the search string to limit the completion candidates."
(interactive)
(company-search-mode 1)
(company-enable-overriding-keymap company-search-map))
nil)))
(defun company-complete-mouse (event)
- "Complete the candidate picked by the mouse."
+ "Insert the candidate picked by the mouse."
(interactive "e")
(when (company-select-mouse event)
(company-complete-selection)))
(defun company-complete-selection ()
- "Complete the selected candidate."
+ "Insert the selected candidate."
(interactive)
(when (company-manual-begin)
(let ((result (nth company-selection company-candidates)))
(company-finish result))))
(defun company-complete-common ()
- "Complete the common part of all candidates."
+ "Insert the common part of all candidates."
(interactive)
(when (company-manual-begin)
(if (and (not (cdr company-candidates))
(equal company-common (car company-candidates)))
(company-complete-selection)
- (insert (company-strip-prefix company-common)))))
+ (when company-common
+ (company--insert-candidate company-common)))))
(defun company-complete ()
- "Complete the common part of all candidates or the current selection.
-The first time this is called, the common part is completed, the second time, or
-when the selection has been changed, the selected candidate is completed."
+ "Insert the common part of all candidates or the current selection.
+The first time this is called, the common part is inserted, the second
+time, or when the selection has been changed, the selected candidate is
+inserted."
(interactive)
(when (company-manual-begin)
(if (or company-selection-changed
(setq this-command 'company-complete-common))))
(defun company-complete-number (n)
- "Complete the Nth candidate.
+ "Insert the Nth candidate.
To show the number next to the candidates in some back-ends, enable
`company-show-numbers'."
(when (company-manual-begin)
(cons selected (company-call-backend 'meta selected))))
(cdr company-last-metadata)))
-(defun company-doc-buffer (&optional _string)
- (with-current-buffer (get-buffer-create "*Company meta-data*")
+(defun company-doc-buffer (&optional string)
+ (with-current-buffer (get-buffer-create "*company-documentation*")
(erase-buffer)
+ (when string
+ (save-excursion
+ (insert string)))
(current-buffer)))
(defvar company--electric-commands
(setq unread-command-events (list last-input-event))))
(defun company-show-doc-buffer ()
- "Temporarily show a buffer with the complete documentation for the selection."
+ "Temporarily show the documentation buffer for the selection."
(interactive)
(company--electric-do
(let* ((selected (nth company-selection company-candidates))
(defun company-begin-with (candidates
&optional prefix-length require-match callback)
"Start a completion at point.
-CANDIDATES is the list of candidates to use and PREFIX-LENGTH is the length of
-the prefix that already is in the buffer before point. It defaults to 0.
+CANDIDATES is the list of candidates to use and PREFIX-LENGTH is the length
+of the prefix that already is in the buffer before point.
+It defaults to 0.
-CALLBACK is a function called with the selected result if the user successfully
-completes the input.
+CALLBACK is a function called with the selected result if the user
+successfully completes the input.
-Example:
-\(company-begin-with '\(\"foo\" \"foobar\" \"foobarbaz\"\)\)"
+Example: \(company-begin-with '\(\"foo\" \"foobar\" \"foobarbaz\"\)\)"
;; FIXME: When Emacs 23 is no longer a concern, replace
;; `company-begin-with-marker' with a lexical variable; use a lexical closure.
(setq company-begin-with-marker (copy-marker (point) t))
(defsubst company-round-tab (arg)
(* (/ (+ arg tab-width) tab-width) tab-width))
-(defun company-untabify (str)
+(defun company-plainify (str)
+ (let ((prefix (get-text-property 0 'line-prefix str)))
+ (when prefix ; Keep the original value unmodified, for no special reason.
+ (setq str (concat prefix str))
+ (remove-text-properties 0 (length str) '(line-prefix) str)))
(let* ((pieces (split-string str "\t"))
(copy pieces))
(while (cdr copy)
(pop copy))
(apply 'concat pieces)))
+(defun company--highlight-common (line properties)
+ ;; XXX: Subject to change.
+ (let ((common (or (company-call-backend 'common-part line)
+ (length company-common))))
+ (add-text-properties 0 common properties line)))
+
(defun company-fill-propertize (line width selected)
- (setq line (company-safe-substring line 0 width))
- (add-text-properties 0 width '(face company-tooltip
- mouse-face company-tooltip-mouse)
- line)
- (add-text-properties 0 (length company-common)
- '(face company-tooltip-common
- mouse-face company-tooltip-mouse)
- line)
- (when selected
- (if (and company-search-string
- (string-match (regexp-quote company-search-string) line
- (length company-prefix)))
- (progn
- (add-text-properties (match-beginning 0) (match-end 0)
- '(face company-tooltip-selection)
- line)
- (when (< (match-beginning 0) (length company-common))
- (add-text-properties (match-beginning 0) (length company-common)
- '(face company-tooltip-common-selection)
- line)))
- (add-text-properties 0 width '(face company-tooltip-selection
- mouse-face company-tooltip-selection)
- line)
- (add-text-properties 0 (length company-common)
- '(face company-tooltip-common-selection
- mouse-face company-tooltip-selection)
- line)))
+ (let* ((margin company-tooltip-margin)
+ (common (+ (or (company-call-backend 'common-part line)
+ (length company-common)) margin)))
+ (setq line (concat (company-space-string company-tooltip-margin)
+ (company-safe-substring
+ line 0 (+ width company-tooltip-margin)))
+ width (+ width (* 2 margin)))
+
+ (add-text-properties 0 width '(face company-tooltip
+ mouse-face company-tooltip-mouse)
+ line)
+ (add-text-properties margin common
+ '(face company-tooltip-common
+ mouse-face company-tooltip-mouse)
+ line)
+ (when selected
+ (if (and company-search-string
+ (string-match (regexp-quote company-search-string) line
+ (length company-prefix)))
+ (progn
+ (add-text-properties (match-beginning 0) (match-end 0)
+ '(face company-tooltip-selection)
+ line)
+ (when (< (match-beginning 0) common)
+ (add-text-properties (match-beginning 0) common
+ '(face company-tooltip-common-selection)
+ line)))
+ (add-text-properties 0 width '(face company-tooltip-selection
+ mouse-face company-tooltip-selection)
+ line)
+ (add-text-properties margin common
+ '(face company-tooltip-common-selection
+ mouse-face company-tooltip-selection)
+ line))))
line)
;;; replace
(nreverse lines)))
(defun company-modify-line (old new offset)
- (let ((prefix (get-text-property 0 'line-prefix old)))
- (when prefix ; Keep the original value unmodified, for no special reason.
- (setq old (concat prefix old))
- (remove-text-properties 0 (length old) '(line-prefix) old)))
(concat (company-safe-substring old 0 offset)
new
(company-safe-substring old (+ offset (length new)))))
(length lst)))
(defun company--replacement-string (lines old column nl &optional align-top)
+ (decf column company-tooltip-margin)
(let ((width (length (car lines)))
- (remaining-cols (- (+ (window-width) (window-hscroll))
+ (remaining-cols (- (+ (company--window-width) (window-hscroll))
column)))
(when (> width remaining-cols)
(decf column (- width remaining-cols))))
- (let (new)
+ (let ((offset (and (< column 0) (- column)))
+ new)
+ (when offset
+ (setq column 0))
(when align-top
;; untouched lines first
(dotimes (_ (- (length old) (length lines)))
(push (pop old) new)))
;; length into old lines.
(while old
- (push (company-modify-line (pop old) (pop lines) column) new))
+ (push (company-modify-line (pop old)
+ (company--offset-line (pop lines) offset)
+ column) new))
;; Append whole new lines.
(while lines
- (push (concat (company-space-string column) (pop lines)) new))
+ (push (concat (company-space-string column)
+ (company--offset-line (pop lines) offset))
+ new))
(let ((str (concat (when nl "\n")
(mapconcat 'identity (nreverse new) "\n")
(font-lock-append-text-property 0 (length str) 'face 'default str)
str)))
+(defun company--offset-line (line offset)
+ (if (and offset line)
+ (substring line offset)
+ line))
+
(defun company--create-lines (selection limit)
(let ((len company-candidates-length)
(numbered 99999)
+ (window-width (company--window-width))
lines
width
lines-copy
len (min limit len)
lines-copy lines)
+ (decf window-width (* 2 company-tooltip-margin))
+
(dotimes (_ len)
(setq width (max (length (pop lines-copy)) width)))
- (setq width (min width (window-width)))
-
+ (setq width (min window-width
+ (if company-show-numbers
+ (+ 2 width)
+ width)))
(setq lines-copy lines)
;; number can make tooltip too long
(setq numbered company-tooltip-offset))
(when previous
- (push (propertize (company-safe-substring previous 0 width)
- 'face 'company-tooltip)
- new))
+ (push (company--position-line previous width) new))
(dotimes (i len)
(push (company-fill-propertize
new))
(when remainder
- (push (propertize (company-safe-substring remainder 0 width)
- 'face 'company-tooltip)
- new))
+ (push (company--position-line remainder width) new))
(setq lines (nreverse new))))
+(defun company--position-line (text width)
+ (propertize (concat (company-space-string company-tooltip-margin)
+ (company-safe-substring text 0 width)
+ (company-space-string company-tooltip-margin))
+ 'face 'company-tooltip))
+
;; show
(defsubst company--window-inner-height ()
(let ((edges (window-inside-edges)))
(- (nth 3 edges) (nth 1 edges))))
+(defsubst company--window-width ()
+ (- (window-width)
+ (cond
+ ((display-graphic-p) 0)
+ ;; Account for the line continuation column.
+ ((version< "24.3.1" emacs-version) 1)
+ ;; Emacs 24.3 and earlier included margins
+ ;; in window-width when in TTY.
+ (t (1+ (let ((margins (window-margins)))
+ (+ (or (car margins) 0)
+ (or (cdr margins) 0))))))))
+
(defun company--pseudo-tooltip-height ()
"Calculate the appropriate tooltip height.
Returns a negative number if the tooltip should be displayed above point."
(move-to-window-line (+ row (abs height)))
(point)))
(ov (make-overlay beg end))
- (args (list (mapcar 'company-untabify
+ (args (list (mapcar 'company-plainify
(company-buffer-lines beg end))
column nl above)))
(overlay-put ov 'company-replacement-args args)
(let ((lines (company--create-lines selection (abs height))))
- (overlay-put ov 'company-before
+ (overlay-put ov 'company-after
(apply 'company--replacement-string lines args))
(overlay-put ov 'company-width (string-width (car lines))))
(defun company-pseudo-tooltip-edit (selection)
(let ((height (overlay-get company-pseudo-tooltip-overlay 'company-height)))
- (overlay-put company-pseudo-tooltip-overlay 'company-before
+ (overlay-put company-pseudo-tooltip-overlay 'company-after
(apply 'company--replacement-string
(company--create-lines selection (abs height))
(overlay-get company-pseudo-tooltip-overlay
(defun company-pseudo-tooltip-hide-temporarily ()
(when (overlayp company-pseudo-tooltip-overlay)
(overlay-put company-pseudo-tooltip-overlay 'invisible nil)
- (overlay-put company-pseudo-tooltip-overlay 'before-string nil)))
+ (overlay-put company-pseudo-tooltip-overlay 'line-prefix nil)
+ (overlay-put company-pseudo-tooltip-overlay 'after-string nil)))
(defun company-pseudo-tooltip-unhide ()
(when company-pseudo-tooltip-overlay
(overlay-put company-pseudo-tooltip-overlay 'priority 1)
;; No (extra) prefix for the first line.
(overlay-put company-pseudo-tooltip-overlay 'line-prefix "")
- (overlay-put company-pseudo-tooltip-overlay 'before-string
- (overlay-get company-pseudo-tooltip-overlay 'company-before))
+ (overlay-put company-pseudo-tooltip-overlay 'after-string
+ (overlay-get company-pseudo-tooltip-overlay 'company-after))
(overlay-put company-pseudo-tooltip-overlay 'window (selected-window))))
(defun company-pseudo-tooltip-guard ()
(defun company-pseudo-tooltip-unless-just-one-frontend (command)
"`company-pseudo-tooltip-frontend', but not shown for single candidates."
(unless (and (eq command 'post-command)
- (not (cdr company-candidates)))
+ (company--show-inline-p))
(company-pseudo-tooltip-frontend command)))
;;; overlay ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun company-preview-if-just-one-frontend (command)
"`company-preview-frontend', but only shown for single candidates."
- (unless (and (eq command 'post-command)
- (cdr company-candidates))
+ (when (or (not (eq command 'post-command))
+ (company--show-inline-p))
(company-preview-frontend command)))
+(defun company--show-inline-p ()
+ (and (not (cdr company-candidates))
+ company-common
+ (string-prefix-p company-prefix company-common
+ (company-call-backend 'ignore-case))))
+
;;; echo ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defvar company-echo-last-msg nil)