[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eglot a7a2b52 27/54: Fix #362: unbreak window/showMessa
From: |
João Távora |
Subject: |
[elpa] externals/eglot a7a2b52 27/54: Fix #362: unbreak window/showMessageRequest |
Date: |
Thu, 16 Apr 2020 05:31:49 -0400 (EDT) |
branch: externals/eglot
commit a7a2b52d156ff506cbcdd9e58108cffce439188f
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Fix #362: unbreak window/showMessageRequest
* eglot.el (eglot-handle-request): Answer with a proper
MessageActionItem.
---
eglot.el | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eglot.el b/eglot.el
index 90f2c68..b3a7f51 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1450,16 +1450,16 @@ COMMAND is a symbol naming the command."
(cl-defmethod eglot-handle-request
(_server (_method (eql window/showMessageRequest)) &key type message actions)
"Handle server request window/showMessageRequest"
- (or (completing-read
- (concat
- (format (propertize "[eglot] Server reports (type=%s): %s"
- 'face (if (<= type 1) 'error))
- type message)
- "\nChoose an option: ")
- (or (mapcar (lambda (obj) (plist-get obj :title)) actions)
- '("OK"))
- nil t (plist-get (elt actions 0) :title))
- (jsonrpc-error :code -32800 :message "User cancelled")))
+ (let ((label (completing-read
+ (concat
+ (format (propertize "[eglot] Server reports (type=%s): %s"
+ 'face (if (<= type 1) 'error))
+ type message)
+ "\nChoose an option: ")
+ (or (mapcar (lambda (obj) (plist-get obj :title)) actions)
+ '("OK"))
+ nil t (plist-get (elt actions 0) :title))))
+ (if label `(:title ,label) :null)))
(cl-defmethod eglot-handle-notification
(_server (_method (eql window/logMessage)) &key _type _message)
- [elpa] externals/eglot 88311a2 12/54: Simplify "maybe"-activation, dump "server" arg, (continued)
- [elpa] externals/eglot 88311a2 12/54: Simplify "maybe"-activation, dump "server" arg, João Távora, 2020/04/16
- [elpa] externals/eglot 7f9784c 11/54: Merge -onoff proxy code into minor mode function, João Távora, 2020/04/16
- [elpa] externals/eglot 9eac9de 16/54: Fix #341: protect against empty-string insertText in completions, João Távora, 2020/04/16
- [elpa] externals/eglot b406818 07/54: Fix #326: support workspace/configuration, João Távora, 2020/04/16
- [elpa] externals/eglot ef34797 14/54: Fix #340: Don't choke on workspace/configuration with no scopeUri, João Távora, 2020/04/16
- [elpa] externals/eglot 27fb0c6 18/54: Support serverInfo of LSP 3.15.0, João Távora, 2020/04/16
- [elpa] externals/eglot 893a05a 20/54: Fix #330: ensure process starts in project's root, João Távora, 2020/04/16
- [elpa] externals/eglot 678feb9 21/54: * eglot.el (eglot-completion-at-point): Remove spurious unrelated change., João Távora, 2020/04/16
- [elpa] externals/eglot 53056a5 22/54: Fix #349: waste less space in completion annotations, João Távora, 2020/04/16
- [elpa] externals/eglot 02f71fd 26/54: Make Travis run company-specific tests, João Távora, 2020/04/16
- [elpa] externals/eglot a7a2b52 27/54: Fix #362: unbreak window/showMessageRequest,
João Távora <=
- [elpa] externals/eglot add568b 28/54: Fix #357: allow non-standard keys in textDocument/publishDiagnostics., João Távora, 2020/04/16
- [elpa] externals/eglot 3879d57 33/54: * eglot.el (eglot-eldoc-function): Fix outdated docstring., João Távora, 2020/04/16
- [elpa] externals/eglot a4c83a6 37/54: Merge pull request #400 from joaotavora/scratch/fix-277-exit-notification, João Távora, 2020/04/16
- [elpa] externals/eglot 7c48c7a 39/54: Document the changes in column calculation, João Távora, 2020/04/16
- [elpa] externals/eglot 2fdffef 41/54: Close #405: support bug-reference-prog-mode, João Távora, 2020/04/16
- [elpa] externals/eglot ce53ca4 44/54: Close #315: introduce and use eglot--{}, the empty JSON object, João Távora, 2020/04/16
- [elpa] externals/eglot 73d3774 24/54: Fix #351: locally tweak imenu-create-index-function, João Távora, 2020/04/16
- [elpa] externals/eglot b0fdfb0 30/54: Close #379: add built-in support for TeX and friends, João Távora, 2020/04/16
- [elpa] externals/eglot c9fcbce 32/54: Close #383: add elm-language-server as the language server for Elm, João Távora, 2020/04/16
- [elpa] externals/eglot 4b453dc 35/54: Fix #389: avoid double shutdowns and simplify shutdown logic, João Távora, 2020/04/16