;;; Code:
+(require 'company)
(require 'cl-lib)
-(require 'yasnippet)
+
+(declare-function yas--table-hash "yasnippet")
+(declare-function yas--get-snippet-tables "yasnippet")
+(declare-function yas-expand-snippet "yasnippet")
+(declare-function yas--template-content "yasnippet")
+(declare-function yas--template-expand-env "yasnippet")
(defun company-yasnippet--candidates (prefix)
- (mapcan
+ (cl-mapcan
(lambda (table)
(let ((keyhash (yas--table-hash table))
res)
(prefix
;; Should probably use `yas--current-key', but that's bound to be slower.
;; How many trigger keys start with non-symbol characters anyway?
- (and yas-minor-mode
+ (and (bound-and-true-p yas-minor-mode)
(company-grab-symbol)))
- (annotation (concat " -> " (get-text-property 0 'yas-annotation arg)))
+ (annotation
+ (concat
+ (unless company-tooltip-align-annotations " -> ")
+ (get-text-property 0 'yas-annotation arg)))
(candidates (company-yasnippet--candidates arg))
(post-completion
(let ((template (get-text-property 0 'yas-template arg)))