[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eglot f730fff 48/69: Merge branch 'master' into jsonrpc
From: |
João Távora |
Subject: |
[elpa] externals/eglot f730fff 48/69: Merge branch 'master' into jsonrpc-refactor |
Date: |
Fri, 22 Jun 2018 11:55:02 -0400 (EDT) |
branch: externals/eglot
commit f730fff1d7164a33367fc4990f1b4f79cc8f7a9c
Merge: 2917214 935edcc
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Merge branch 'master' into jsonrpc-refactor
---
eglot.el | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/eglot.el b/eglot.el
index 70d133b..60a0322 100644
--- a/eglot.el
+++ b/eglot.el
@@ -752,7 +752,7 @@ Uses THING, FACE, DEFS and PREPEND."
(t 'eglot-note))
message `((eglot-lsp-diag .
,diag-spec)))))
into diags
- finally (cond (eglot--current-flymake-report-fn
+ finally (cond ((and flymake-mode eglot--current-flymake-report-fn)
(funcall eglot--current-flymake-report-fn diags)
(setq eglot--unreported-diagnostics nil))
(t
@@ -1303,6 +1303,18 @@ If SKIP-SIGNATURE, don't try to send
textDocument/signatureHelp."
;;; Dynamic registration
;;;
+(defun eglot--wildcard-to-regexp (wildcard)
+ "(Very lame attempt to) convert WILDCARD to a Elisp regexp."
+ (cl-loop
+ with substs = '(("{" . "\\\\(")
+ ("}" . "\\\\)")
+ ("," . "\\\\|"))
+ with string = (wildcard-to-regexp wildcard)
+ for (pattern . rep) in substs
+ for target = string then result
+ for result = (replace-regexp-in-string pattern rep target)
+ finally return result))
+
(cl-defun eglot--register-workspace/didChangeWatchedFiles (server &key id
watchers)
"Handle dynamic registration of workspace/didChangeWatchedFiles"
(eglot--unregister-workspace/didChangeWatchedFiles server :id id)
@@ -1316,7 +1328,7 @@ If SKIP-SIGNATURE, don't try to send
textDocument/signatureHelp."
((and (memq action '(created changed deleted))
(cl-find file globs
:test (lambda (f glob)
- (string-match (wildcard-to-regexp
+ (string-match (eglot--wildcard-to-regexp
(expand-file-name glob))
f))))
(jsonrpc-notify
- [elpa] externals/eglot f594dd7 36/69: jsonrpc-request also calls for deferred action cleanup, (continued)
- [elpa] externals/eglot f594dd7 36/69: jsonrpc-request also calls for deferred action cleanup, João Távora, 2018/06/22
- [elpa] externals/eglot dae1de1 41/69: Tweak Makefile to run both tests in a row, João Távora, 2018/06/22
- [elpa] externals/eglot c790274 39/69: jsonrpc--next-request-id is a connection slot, João Távora, 2018/06/22
- [elpa] externals/eglot 68c266e 45/69: Avoid more catastrophes, João Távora, 2018/06/22
- [elpa] externals/eglot bf9c850 52/69: Get rid of jsonrpc-obj, João Távora, 2018/06/22
- [elpa] externals/eglot 0b474ec 63/69: Fix use of jsonrpc-message in tests, João Távora, 2018/06/22
- [elpa] externals/eglot 44e9647 46/69: Simplify JSONRPC connection shutdown, João Távora, 2018/06/22
- [elpa] externals/eglot 47b957d 65/69: Let's not send Content-type for now., João Távora, 2018/06/22
- [elpa] externals/eglot 61d1276 66/69: Fix another bug in jsonrpc-connection-send, João Távora, 2018/06/22
- [elpa] externals/eglot 2917214 47/69: Merge master into jsonrpc-refactor, João Távora, 2018/06/22
- [elpa] externals/eglot f730fff 48/69: Merge branch 'master' into jsonrpc-refactor,
João Távora <=
- [elpa] externals/eglot aaca7de 60/69: Fix ridiculous bug, João Távora, 2018/06/22
- [elpa] externals/eglot d87f4bf 55/69: jsonrpc--log-event should also be private, João Távora, 2018/06/22
- [elpa] externals/eglot a65d3f4 53/69: Make message and warning helpers private, João Távora, 2018/06/22
- [elpa] externals/eglot 9e9dc57 30/69: Merge branch 'master' into jsonrpc-refactor (using regular merge), João Távora, 2018/06/22
- [elpa] externals/eglot 6c9d41e 38/69: Add reasonably sophisticated deferred action tests, João Távora, 2018/06/22
- [elpa] externals/eglot 2da7d92 50/69: Simplify JSONRPC status setting, João Távora, 2018/06/22
- [elpa] externals/eglot 69a622a 64/69: Fix some typos, João Távora, 2018/06/22
- [elpa] externals/eglot 7371f68 57/69: * jsonrpc.el: Rewrite commentary., João Távora, 2018/06/22
- [elpa] externals/eglot 6531c8b 58/69: Merge branch 'master' into jsonrpc-refactor, João Távora, 2018/06/22
- [elpa] externals/eglot 59cc3fb 61/69: jsonrpc-connection-receive is now a public convenience function, João Távora, 2018/06/22