Rename company-clang-obc-templatify to company-template-objc-templatify

As requested in https://github.com/company-mode/company-mode/commit/5fc4a9a0b0c75f4f128ad01ca8befd1928399c86#commitcomment-15230965.

diff --git a/NEWS.md b/NEWS.md
index a32baded2b8c3a0ea6cf5b860dc0c1d9fb1d3707..6fa729cf838e4602b46776f92079482a7ab29556 100644 (file)
--- 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 890a25d84d81e977d9b5da343f0318fbaf5f78cc..067797f3feac9763d7df51827233453d20d2a70b 100644 (file)
--- 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 02065afaf42a1758b336e43cdad3dd9b0bb6ab00..485faba6d081e3b00191e2a4523517dae1d8f610 100644 (file)
--- 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 4db3ce3cbff0d733b09525fb0aff879fbd5bbc79..da746bd72adde4a0b4a30f94b3de6ea2cba00cef 100644 (file)
--- 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)"))))