:type 'file)
(defcustom company-clang-begin-after-member-access t
- "When non-nil, automatic completion will start whenever the current symbol is
-preceded by \".\", \"->\" or \"::\", ignoring `company-minimum-prefix-length'.
+ "When non-nil, automatic completion will start whenever the current
+symbol is preceded by \".\", \"->\" or \"::\", ignoring
+`company-minimum-prefix-length'.
-If `company-begin-commands' is a list, it should include `c-electric-lt-gt' and
-`c-electric-colon', for automatic completion right after \">\" and \":\".")
+If `company-begin-commands' is a list, it should include `c-electric-lt-gt'
+and `c-electric-colon', for automatic completion right after \">\" and
+\":\".")
(defcustom company-clang-arguments nil
"Additional arguments to pass to clang when completing.
-Prefix files (-include ...) can be selected with
-`company-clang-set-prefix' or automatically through a custom
-`company-clang-prefix-guesser'."
+Prefix files (-include ...) can be selected with `company-clang-set-prefix'
+or automatically through a custom `company-clang-prefix-guesser'."
:type '(repeat (string :tag "Argument" nil)))
(defcustom company-clang-prefix-guesser 'company-clang-guess-prefix
(defconst company-clang--error-buffer-name "*clang error*")
-(defvar company-clang--meta-cache nil)
-
(defun company-clang--lang-option ()
(if (eq major-mode 'objc-mode)
(if (string= "m" (file-name-extension buffer-file-name))
(regexp-quote prefix)))
(case-fold-search nil)
lines match)
- (setq company-clang--meta-cache (make-hash-table :test 'equal))
(while (re-search-forward pattern nil t)
(setq match (match-string-no-properties 1))
(unless (equal match "Pattern")
+ (save-match-data
+ (when (string-match ":" match)
+ (setq match (substring match 0 (match-beginning 0)))))
(let ((meta (match-string-no-properties 2)))
(when (and meta (not (string= match meta)))
- (setq meta (company-clang--strip-formatting meta))
- (when (and (not objc) (string-match "\\((.*)\\)" meta))
- (setq match (concat match (match-string 1 meta))))
- (puthash match meta company-clang--meta-cache)))
+ (put-text-property 0 1 'meta
+ (company-clang--strip-formatting meta)
+ match)))
(push match lines)))
lines))
+(defun company-clang--meta (candidate)
+ (get-text-property 0 'meta candidate))
+
+(defun company-clang--annotation (candidate)
+ (let ((meta (company-clang--meta candidate)))
+ (cond
+ ((null meta) nil)
+ ((string-match ":" meta)
+ (substring meta (match-beginning 0)))
+ ((string-match "\\((.*)\\'\\)" meta)
+ (match-string 1 meta)))))
+
(defun company-clang--strip-formatting (text)
(replace-regexp-in-string
"#]" " "
(defun company-clang--handle-error (res args)
(goto-char (point-min))
(let* ((buf (get-buffer-create company-clang--error-buffer-name))
- (cmd (concat company-clang-executable (mapconcat 'identity args " ")))
+ (cmd (concat company-clang-executable " " (mapconcat 'identity args " ")))
(pattern (format company-clang--completion-pattern ""))
(err (if (re-search-forward pattern nil t)
(buffer-substring-no-properties (point-min)
(format "%s:%d:%d"
(if (company-clang--auto-save-p) buffer-file-name "-")
(line-number-at-pos)
- (1+ (current-column)))))
+ (1+ (length
+ (encode-coding-region
+ (line-beginning-position)
+ (point)
+ 'utf-8
+ t))))))
(defsubst company-clang--build-complete-args (pos)
(append '("-cc1" "-fsyntax-only" "-code-completion-macros")
(defun company-clang-objc-templatify (selector)
(let* ((end (point-marker))
- (beg (- (point) (length selector)))
+ (beg (- (point) (length selector) 1))
(templ (company-template-declare-template beg end))
(cnt 0))
(save-excursion
(goto-char beg)
(catch 'stop
(while (search-forward ":" end t)
+ (when (looking-at "([^)]*) ?")
+ (delete-region (match-beginning 0) (match-end 0)))
(company-template-add-field templ (point) (format "arg%d" cnt))
(if (< (point) end)
(insert " ")
with `company-clang-set-prefix' or automatically through a custom
`company-clang-prefix-guesser'.
-With Clang versions before 2.9, we have to save the buffer before performing
-completion. With Clang 2.9 and later, buffer contents are passed via standard
-input."
+With Clang versions before 2.9, we have to save the buffer before
+performing completion. With Clang 2.9 and later, buffer contents are
+passed via standard input."
(interactive (list 'interactive))
(case command
(interactive (company-begin-backend 'company-clang))
(not (company-in-string-or-comment))
(company-clang--prefix)))
(candidates (company-clang--candidates arg))
- (meta (gethash arg company-clang--meta-cache))
- (crop (and (string-match ":\\|(" arg)
- (substring arg 0 (match-beginning 0))))
- (post-completion (cond
- ((not (derived-mode-p 'objc-mode))
- (company-template-c-like-templatify arg))
- ((string-match ":" arg)
- (company-clang-objc-templatify arg))))))
+ (meta (company-clang--meta arg))
+ (annotation (company-clang--annotation arg))
+ (post-completion (let ((anno (company-clang--annotation arg)))
+ (when anno
+ (insert anno)
+ (if (string-match ":" anno)
+ (company-clang-objc-templatify anno)
+ (company-template-c-like-templatify anno)))))))
(provide 'company-clang)
;;; company-clang.el ends here