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

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

[elpa] externals/kind-icon ff36bf5d7a: Work around eglot/lsp-mode disagr


From: ELPA Syncer
Subject: [elpa] externals/kind-icon ff36bf5d7a: Work around eglot/lsp-mode disagreement enum-member+type-parameter
Date: Thu, 2 Mar 2023 22:58:37 -0500 (EST)

branch: externals/kind-icon
commit ff36bf5d7a3404a4361c59b3ac7d6c1dc59aaaab
Author: JD Smith <93749+jdtsmith@users.noreply.github.com>
Commit: JD Smith <93749+jdtsmith@users.noreply.github.com>

    Work around eglot/lsp-mode disagreement enum-member+type-parameter
    
    eglot uses e.g. enummember, lsp-mode uses enum-member.  The LSP
    protocol mentions these in CamelCase so it's not clear which should be
    preferred, but snake-case was adopted.  We support both until eglot's
    fixes are more widely propagated.  See: company-mode/company-mode#1370.
---
 kind-icon.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kind-icon.el b/kind-icon.el
index 5db6c16f6a..e321b2646f 100644
--- a/kind-icon.el
+++ b/kind-icon.el
@@ -94,7 +94,9 @@ Use as a custom-set function."
     (command "cm" :icon "code-greater-than" :face default)
     (constant "co" :icon "lock-remove-outline" :face font-lock-constant-face)
     (constructor "cn" :icon "table-column-plus-after" :face 
font-lock-function-name-face)
+    ;; FIXME: remove this once eglot patch is in Emacs
     (enummember "em" :icon "order-bool-ascending-variant" :face 
font-lock-builtin-face)
+    (enum-member "em" :icon "order-bool-ascending-variant" :face 
font-lock-builtin-face)
     (enum "e" :icon "format-list-bulleted-square" :face font-lock-builtin-face)
     (event "ev" :icon "lightning-bolt-outline" :face font-lock-warning-face)
     (field "fd" :icon "application-braces-outline" :face 
font-lock-variable-name-face)
@@ -116,7 +118,9 @@ Use as a custom-set function."
     (string "s" :icon "sticker-text-outline" :face font-lock-string-face)
     (struct "%" :icon "code-braces" :face font-lock-variable-name-face)
     (text "tx" :icon "script-text-outline" :face font-lock-doc-face)
+    ;; FIXME: remove this once eglot patch is in Emacs
     (typeparameter "tp" :icon "format-list-bulleted-type" :face 
font-lock-type-face)
+    (type-parameter "tp" :icon "format-list-bulleted-type" :face 
font-lock-type-face)
     (unit "u" :icon "ruler-square" :face font-lock-constant-face)
     (value "v" :icon "plus-circle-outline" :face font-lock-builtin-face)
     (variable "va" :icon "variable" :face font-lock-variable-name-face)



reply via email to

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