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

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

[elpa] externals/company 4a122c9: Add file and folder kinds; integrate m


From: ELPA Syncer
Subject: [elpa] externals/company 4a122c9: Add file and folder kinds; integrate more backends
Date: Sun, 28 Mar 2021 17:57:07 -0400 (EDT)

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

    Add file and folder kinds; integrate more backends
---
 company-dabbrev-code.el       | 1 +
 company-dabbrev.el            | 1 +
 company-files.el              | 1 +
 company-ispell.el             | 1 +
 company-keywords.el           | 1 +
 company.el                    | 2 ++
 icons/vscode-dark/folder.svg  | 3 +++
 icons/vscode-light/folder.svg | 3 +++
 8 files changed, 13 insertions(+)

diff --git a/company-dabbrev-code.el b/company-dabbrev-code.el
index 6d250ce..a81dcde 100644
--- a/company-dabbrev-code.el
+++ b/company-dabbrev-code.el
@@ -97,6 +97,7 @@ comments or strings."
                      (`code company-dabbrev-code-modes)
                      (`all `all))
                    (not company-dabbrev-code-everywhere))))
+    (kind 'key)
     (ignore-case company-dabbrev-code-ignore-case)
     (duplicates t)))
 
diff --git a/company-dabbrev.el b/company-dabbrev.el
index 88b7419..dad4ef5 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -199,6 +199,7 @@ This variable affects both `company-dabbrev' and 
`company-dabbrev-code'."
        (if downcase-p
            (mapcar 'downcase words)
          words)))
+    (kind 'key)
     (ignore-case company-dabbrev-ignore-case)
     (duplicates t)))
 
diff --git a/company-files.el b/company-files.el
index 3d74c4d..88da2bf 100644
--- a/company-files.el
+++ b/company-files.el
@@ -144,6 +144,7 @@ File paths with spaces are only supported inside strings."
     (location (cons (dired-noselect
                      (file-name-directory (directory-file-name arg))) 1))
     (post-completion (company-files--post-completion arg))
+    (kind (if (string-suffix-p "/" arg) 'folder 'file))
     (sorted t)
     (no-cache t)))
 
diff --git a/company-ispell.el b/company-ispell.el
index 4d0bc22..6d1a072 100644
--- a/company-ispell.el
+++ b/company-ispell.el
@@ -75,6 +75,7 @@ If nil, use `ispell-complete-word-dict'."
            words
          ;; Work around issue #284.
          (all-completions arg words))))
+    (kind 'key)
     (sorted t)
     (ignore-case 'keep-prefix)))
 
diff --git a/company-keywords.el b/company-keywords.el
index 80a0103..2c535a8 100644
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -308,6 +308,7 @@
        (all-completions arg (if (consp symbols)
                                 symbols
                               (cdr (assq symbols company-keywords-alist))))))
+    (kind 'keyword)
     (sorted t)))
 
 (provide 'company-keywords)
diff --git a/company.el b/company.el
index 59463c3..73afcb2 100644
--- a/company.el
+++ b/company.el
@@ -1372,6 +1372,8 @@ end of the match."
     (enum . "symbol-enumerator.svg")
     (event . "symbol-event.svg")
     (field . "symbol-field.svg")
+    (file . "symbol-file.svg")
+    (folder . "folder.svg")
     (interface . "symbol-interface.svg")
     (key . "symbol-key.svg")
     (keyword . "symbol-keyword.svg")
diff --git a/icons/vscode-dark/folder.svg b/icons/vscode-dark/folder.svg
new file mode 100644
index 0000000..7387525
--- /dev/null
+++ b/icons/vscode-dark/folder.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" 
xmlns="http://www.w3.org/2000/svg";>
+<path d="M14.5 3H7.70996L6.85999 2.15002L6.51001 2H1.51001L1.01001 
2.5V6.5V13.5L1.51001 14H14.51L15.01 13.5V9V3.5L14.5 3ZM13.99 
11.49V13H1.98999V11.49V7.48999V7H6.47998L6.82996 6.84998L7.68994 
5.98999H14V7.48999L13.99 11.49ZM13.99 5H7.48999L7.14001 5.15002L6.28003 
6.01001H2V3.01001H6.29004L7.14001 3.85999L7.5 4.01001H14L13.99 5Z" 
fill="#C5C5C5"/>
+</svg>
\ No newline at end of file
diff --git a/icons/vscode-light/folder.svg b/icons/vscode-light/folder.svg
new file mode 100644
index 0000000..c0939fe
--- /dev/null
+++ b/icons/vscode-light/folder.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" 
xmlns="http://www.w3.org/2000/svg";>
+<path d="M14.5002 3H7.71021L6.86023 2.15002L6.51025 2H1.51025L1.01025 
2.5V6.5V13.5L1.51025 14H14.5103L15.0103 13.5V9V3.5L14.5002 3ZM13.9902 
11.49V13H1.99023V11.49V7.48999V7H6.48022L6.8302 6.84998L7.69019 
5.98999H14.0002V7.48999L13.9902 11.49ZM13.9902 5H7.49023L7.14026 
5.15002L6.28027 6.01001H2.00024V3.01001H6.29028L7.14026 3.85999L7.50024 
4.01001H14.0002L13.9902 5Z" fill="#424242"/>
+</svg>
\ No newline at end of file



reply via email to

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