From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 28 Apr 2014 10:05:35 +0000 (+0400)
Subject: company-clang: don't mistake scoping operator for objc args
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/43283ba0be1246b3eb60de65c7c0ce6e7d078d28

company-clang: don't mistake scoping operator for objc args
---

diff --git a/company-clang.el b/company-clang.el
index 4f0f3189e..1ddb7caa1 100644
--- a/company-clang.el
+++ b/company-clang.el
@@ -145,7 +145,7 @@ or automatically through a custom `company-clang-prefix-guesser'."
   (let ((meta (company-clang--meta candidate)))
     (cond
      ((null meta) nil)
-     ((string-match ":" meta)
+     ((string-match "[^:]:[^:]" meta)
       (substring meta (match-beginning 0)))
      ((string-match "\\((.*)\\'\\)" meta)
       (match-string 1 meta)))))
@@ -316,9 +316,9 @@ passed via standard input."
     (post-completion (let ((anno (company-clang--annotation arg)))
                        (when (and company-clang-insert-arguments anno)
                          (insert anno)
-                         (if (string-match ":" anno)
+                         (if (string-match "[^:]:[^:]" anno)
                              (company-clang-objc-templatify anno)
-                          (company-template-c-like-templatify anno)))))))
+                           (company-template-c-like-templatify anno)))))))
 
 (provide 'company-clang)
 ;;; company-clang.el ends here