[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 1.3 8829655 10/26: Per #171,#156: Introduce eglot--dcase
From: |
Christian Johansson |
Subject: |
[elpa] 1.3 8829655 10/26: Per #171,#156: Introduce eglot--dcase |
Date: |
Thu, 29 Apr 2021 15:09:14 -0400 (EDT) |
tag: 1.3
commit 88296552c2395e3e71c67291e2ae8ece84949e16
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>
Per #171,#156: Introduce eglot--dcase
* eglot.el (eglot--dcase): New macro.
* eglot-tests.el (eglot-dcase-with-interface)
(eglot-dcase-no-interface): New tests.
---
eglot-tests.el | 10 ++++++++++
eglot.el | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/eglot-tests.el b/eglot-tests.el
index 8b91317..37184d0 100644
--- a/eglot-tests.el
+++ b/eglot-tests.el
@@ -646,6 +646,16 @@ Pass TIMEOUT to `eglot--with-timeout'."
(eglot--dbind ((FooObject) foo bar) `(:foo "foo" :baz bargh)
(cons foo bar))))))
+(ert-deftest eglot-dcase ()
+ (let ((eglot--lsp-interface-alist
+ `((FooObject . ((:foo :bar) (:baz))))))
+ (should
+ (equal
+ "foo"
+ (eglot--dcase `(:foo "foo" :bar "bar")
+ (((FooObject) foo)
+ foo))))))
+
(provide 'eglot-tests)
;;; eglot-tests.el ends here
diff --git a/eglot.el b/eglot.el
index 594a638..61f9b70 100644
--- a/eglot.el
+++ b/eglot.el
@@ -281,6 +281,47 @@ Honour `eglot-strict-mode'."
(let ((e (cl-gensym "jsonrpc-lambda-elem")))
`(lambda (,e) (eglot--dbind ,cl-lambda-list ,e ,@body))))
+(cl-defmacro eglot--dcase (obj &rest clauses)
+ "Like `pcase', but for the LSP object OBJ.
+CLAUSES is a list (DESTRUCTURE FORMS...) where DESTRUCTURE is
+treated as in `eglot-dbind'."
+ (let ((obj-once (make-symbol "obj-once")))
+ `(let ((,obj-once ,obj))
+ (cond
+ ,@(cl-loop
+ for (vars . body) in clauses
+ for vars-as-keywords = (mapcar (lambda (var)
+ (intern (format ":%s" var)))
+ vars)
+ for interface-name = (if (consp (car vars))
+ (car (pop vars)))
+ for condition =
+ (if interface-name
+ `(let* ((interface
+ (or (assoc ',interface-name eglot--lsp-interface-alist)
+ (eglot--error "Unknown interface %s")))
+ (object-keys (eglot--plist-keys ,obj-once))
+ (required-keys (car (cdr interface))))
+ (and (null (cl-set-difference required-keys object-keys))
+ (or (null (memq 'disallow-non-standard-keys
+ eglot-strict-mode))
+ (null (cl-set-difference
+ (cl-set-difference object-keys required-keys)
+ (cadr (cdr interface)))))))
+ ;; In this interface-less mode we don't check
+ ;; `eglot-strict-mode' at all.
+ `(null (cl-set-difference
+ ',vars-as-keywords
+ (eglot--plist-keys ,obj-once))))
+ collect `(,condition
+ (cl-destructuring-bind (&key ,@vars &allow-other-keys)
+ ,obj-once
+ ,@body)))
+ (t
+ (eglot--error "%s didn't match any of %s"
+ ,obj-once
+ ',(mapcar #'car clauses)))))))
+
;;; API (WORK-IN-PROGRESS!)
;;;
- [elpa] 1.3 updated (23accee -> c3d2000), Christian Johansson, 2021/04/29
- [elpa] 1.3 bad07bd 01/26: Per #144, #156: control strictness towards incoming LSP messages, Christian Johansson, 2021/04/29
- [elpa] 1.3 591210f 13/26: Close #173: support completionContext to help servers like ccls, Christian Johansson, 2021/04/29
- [elpa] 1.3 8829655 10/26: Per #171,#156: Introduce eglot--dcase,
Christian Johansson <=
- [elpa] 1.3 245493c 23/26: Handle array params to server notification or requests, Christian Johansson, 2021/04/29
- [elpa] 1.3 1a45d87 03/26: Revert "Fix #164: CodeAction command can be a Command object (#165)", Christian Johansson, 2021/04/29
- [elpa] 1.3 a653dcb 04/26: Fix #52: Use entire line as xref summary when available, Christian Johansson, 2021/04/29
- [elpa] 1.3 dadc5a2 15/26: Fix #159: Properly clear old diagnostics when making new ones, Christian Johansson, 2021/04/29
- [elpa] 1.3 e22d4d3 09/26: Simplify interface of eglot--dbind macro, Christian Johansson, 2021/04/29
- [elpa] 1.3 8c71a1a 18/26: Per #173: fix bug introduced by previous fix, Christian Johansson, 2021/04/29
- [elpa] 1.3 84a271c 08/26: Robustify tests against (M)ELPA eglot installations, Christian Johansson, 2021/04/29
- [elpa] 1.3 0f74616 07/26: Touch up last commit, Christian Johansson, 2021/04/29
- [elpa] 1.3 dc84ff6 06/26: * eglot.el (eglot--current-column): New helper., Christian Johansson, 2021/04/29
- [elpa] 1.3 5595a75 12/26: Fix #116, #150: don't break in indirect buffers, Christian Johansson, 2021/04/29