emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/company 915b79a 2/6: Do some renames


From: ELPA Syncer
Subject: [elpa] externals/company 915b79a 2/6: Do some renames
Date: Sat, 27 Mar 2021 21:57:12 -0400 (EDT)

branch: externals/company
commit 915b79ad1cc3292c5f648e33971f45501db62ba5
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Do some renames
    
    A function should not be called *-function. That's a variable's name.
    #1070
---
 company.el | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/company.el b/company.el
index 60629f6..fd7715f 100644
--- a/company.el
+++ b/company.el
@@ -1430,7 +1430,7 @@ end of the match."
   "Default icons size."
   :type 'integer)
 
-(defun company--icons-margin-function (icon-mapping root-dir candidate 
selected)
+(defun company--render-icons-margin (icon-mapping root-dir candidate selected)
   (if-let ((candidate candidate)
            (kind (company-call-backend 'kind candidate))
            (icon-file (alist-get kind icon-mapping)))
@@ -1451,19 +1451,19 @@ end of the match."
          (propertize " " 'display `(space . (:width ,(- 2 (car (image-size 
spec))))))))
     "  "))
 
-(defun company-vscode-dark-icons-margin-function (candidate selected)
+(defun company-vscode-dark-icons-margin (candidate selected)
   "Margin function which returns icons from vscode's dark theme."
-  (company--icons-margin-function company-vscode-icons-mapping
-                                  (expand-file-name "vscode-dark" 
company-icons-root)
-                                  candidate
-                                  selected))
+  (company--render-icons-margin company-vscode-icons-mapping
+                                (expand-file-name "vscode-dark" 
company-icons-root)
+                                candidate
+                                selected))
 
-(defun company-vscode-light-icons-margin-function (candidate selected)
+(defun company-vscode-light-icons-margin (candidate selected)
   "Margin function which returns icons from vscode's light theme."
-  (company--icons-margin-function company-vscode-icons-mapping
-                                  (expand-file-name "vscode-light" 
company-icons-root)
-                                  candidate
-                                  selected))
+  (company--render-icons-margin company-vscode-icons-mapping
+                                (expand-file-name "vscode-light" 
company-icons-root)
+                                candidate
+                                selected))
 
 (defcustom company-format-margin-function nil
   "Function to format the margin.
@@ -1474,8 +1474,8 @@ image for the returned kind image. Function is called 
with (nil nil) to get
 the default margin."
   :type '(choice
           (const :tag "Disabled" nil)
-          (const :tag "VScode dark icons theme" 
company-vscode-dark-icons-margin-function)
-          (const :tag "VScode light icons theme" 
company-vscode-light-icons-margin-function)
+          (const :tag "VScode dark icons theme" 
company-vscode-dark-icons-margin)
+          (const :tag "VScode light icons theme" 
company-vscode-light-icons-margin)
           (function :tag "Custom icon function.")))
 
 (defun company-occurrence-prefer-closest-above (pos match-beg match-end)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]