[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6bf2491 102/173: Rename company-clang-obc-templatify to co
From: |
Dmitry Gutov |
Subject: |
[elpa] master 6bf2491 102/173: Rename company-clang-obc-templatify to company-template-objc-templatify |
Date: |
Thu, 23 Jun 2016 00:28:42 +0000 (UTC) |
branch: master
commit 6bf24912a8a3c2cfc5e72073b8eb0f1137ab7728
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Rename company-clang-obc-templatify to company-template-objc-templatify
As requested in
https://github.com/company-mode/company-mode/commit/5fc4a9a0b0c75f4f128ad01ca8befd1928399c86#commitcomment-15230965.
---
NEWS.md | 2 ++
company-clang.el | 2 +-
company-template.el | 2 +-
test/template-tests.el | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index a32bade..6fa729c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,8 @@
## Next
+* `company-clang-objc-templatify` has been renamed to
+ `company-template-objc-templatify`.
* When duplicates are removed, completions without annotations are also removed
in favor of completions with equal names that have annotations (experimental
change) ([#432](https://github.com/company-mode/company-mode/issues/432)).
diff --git a/company-clang.el b/company-clang.el
index 890a25d..067797f 100644
--- a/company-clang.el
+++ b/company-clang.el
@@ -323,7 +323,7 @@ passed via standard input."
(when (and company-clang-insert-arguments anno)
(insert anno)
(if (string-match "\\`:[^:]" anno)
- (company-clang-objc-templatify anno)
+ (company-template-objc-templatify anno)
(company-template-c-like-templatify
(concat arg anno))))))))
diff --git a/company-template.el b/company-template.el
index 02065af..485faba 100644
--- a/company-template.el
+++ b/company-template.el
@@ -185,7 +185,7 @@ Leave point at the end of the field."
;; objc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defun company-clang-objc-templatify (selector)
+(defun company-template-objc-templatify (selector)
(let* ((end (point-marker))
(beg (- (point) (length selector) 1))
(templ (company-template-declare-template beg end))
diff --git a/test/template-tests.el b/test/template-tests.el
index 4db3ce3..da746bd 100644
--- a/test/template-tests.el
+++ b/test/template-tests.el
@@ -105,15 +105,15 @@
(with-temp-buffer
(let ((text "createBookWithTitle:andAuthor:"))
(insert text)
- (company-clang-objc-templatify text)
+ (company-template-objc-templatify text)
(should (equal "createBookWithTitle:arg0 andAuthor:arg1"
(buffer-string)))
(should (looking-at "arg0"))
(should (null (overlay-get (company-template-field-at) 'display))))))
-(ert-deftest company-clang-objc-templatify ()
+(ert-deftest company-template-objc-templatify ()
(with-temp-buffer
(let ((text "createBookWithTitle:(NSString) andAuthor:(id)"))
(insert text)
- (company-clang-objc-templatify text)
+ (company-template-objc-templatify text)
(should (equal (buffer-string) text))
(company-template-field-assert-text "(NSString)"))))
- [elpa] master c6af7d2 061/173: Mention the previous change in NEWS [ci skip], (continued)
- [elpa] master c6af7d2 061/173: Mention the previous change in NEWS [ci skip], Dmitry Gutov, 2016/06/22
- [elpa] master 5d68a50 069/173: [Fix #317] Allow :sorted keyword in grouped backends, Dmitry Gutov, 2016/06/22
- [elpa] master 87351aa 073/173: Double space, Dmitry Gutov, 2016/06/22
- [elpa] master 8952cfe 085/173: Handle key prefix being shorter than prefix (#422), Dmitry Gutov, 2016/06/22
- [elpa] master c2e5981 017/173: Remove company-ropemacs, Dmitry Gutov, 2016/06/22
- [elpa] master d97c98f 076/173: company-search-candidates: Mention company-search-regexp-function, Dmitry Gutov, 2016/06/22
- [elpa] master 2306c9c 054/173: Support whitespace-mode newline-mark, Dmitry Gutov, 2016/06/22
- [elpa] master 4a16a55 090/173: company-dabbrev--make-regexp: Regexp can match non-word characters, Dmitry Gutov, 2016/06/22
- [elpa] master 1c36f7c 091/173: company-dabbrev--search-buffer: Use use forward search (#433), Dmitry Gutov, 2016/06/22
- [elpa] master da9b108 104/173: Refine the workaround further, Dmitry Gutov, 2016/06/22
- [elpa] master 6bf2491 102/173: Rename company-clang-obc-templatify to company-template-objc-templatify,
Dmitry Gutov <=
- [elpa] master a95d7f1 081/173: Respect yas-key-syntaxes (#422), Dmitry Gutov, 2016/06/22
- [elpa] master 5d0a9bb 118/173: company-semantic: Retain function overloads, Dmitry Gutov, 2016/06/22
- [elpa] master ca447ec 129/173: [#464] Optimisation and fixes in `company-files`, Dmitry Gutov, 2016/06/22
- [elpa] master b526978 133/173: Fix typo in dependency name, Dmitry Gutov, 2016/06/22
- [elpa] master 39eb115 113/173: company--posn-col-row: Fall back to posn-col-row, Dmitry Gutov, 2016/06/22
- [elpa] master ae0a406 139/173: Add some C++11 keywords, fixes #478, Dmitry Gutov, 2016/06/22
- [elpa] master 9b89556 149/173: company-capf: Look up `face', not `font-lock-face', Dmitry Gutov, 2016/06/22
- [elpa] master d587bd0 156/173: Fix an old typo, Dmitry Gutov, 2016/06/22
- [elpa] master 2d9bf1e 160/173: company--preprocess-candidates: Check that all CANDIDATES are strings, Dmitry Gutov, 2016/06/22
- [elpa] master 395f846 159/173: Revert "Remove completions without annotations when considering duplicates", Dmitry Gutov, 2016/06/22