[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eglot 24877ae 15/15: Fix a bug introduced in the previo
From: |
João Távora |
Subject: |
[elpa] externals/eglot 24877ae 15/15: Fix a bug introduced in the previous commit |
Date: |
Sun, 20 May 2018 19:59:04 -0400 (EDT) |
branch: externals/eglot
commit 24877aeff3853a493deda0b722f7d12e1ab745d7
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Fix a bug introduced in the previous commit
* eglot.el (eglot--format-markup): Ignore errors when calling
possibly unknown functions.
(eglot-completion-at-point): Use eglot--format-markup
(eglot--hover-info): Yak shaving
---
eglot.el | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/eglot.el b/eglot.el
index 72e5d31..9d7253a 100644
--- a/eglot.el
+++ b/eglot.el
@@ -779,7 +779,8 @@ If optional MARKER, return a marker instead"
(list (plist-get markup :value)
(intern (concat (plist-get markup :language) "-mode"
))))))
(with-temp-buffer
- (funcall mode) (insert string) (font-lock-ensure) (buffer-string))))
+ (ignore-errors (funcall mode))
+ (insert string) (font-lock-ensure) (buffer-string))))
(defun eglot--server-capable (&rest feats)
"Determine if current server is capable of FEATS."
@@ -1324,10 +1325,7 @@ DUMMY is ignored"
:documentation)))))
(when documentation
(with-current-buffer (get-buffer-create " *eglot doc*")
- (erase-buffer)
- (ignore-errors (funcall (intern "markdown-mode")))
- (font-lock-ensure)
- (insert documentation)
+ (insert (eglot--format-markup documentation))
(current-buffer)))))
:exit-function (lambda (_string _status)
(eglot--signal-textDocument/didChange)
@@ -1339,10 +1337,8 @@ DUMMY is ignored"
(concat (and range (pcase-let ((`(,beg ,end) (eglot--range-region range)))
(concat (buffer-substring beg end) ": ")))
(mapconcat #'eglot--format-markup
- (append (cond ((vectorp contents)
- contents)
- (contents
- (list contents)))) "\n")))
+ (append (cond ((vectorp contents) contents)
+ (contents (list contents)))) "\n")))
(defun eglot--sig-info (sigs active-sig active-param)
(cl-loop
- [elpa] externals/eglot 3f6d2e2 04/15: Close #4: Collect regions to change as markers, then edit, (continued)
- [elpa] externals/eglot 3f6d2e2 04/15: Close #4: Collect regions to change as markers, then edit, João Távora, 2018/05/20
- [elpa] externals/eglot a91d72c 01/15: Simplify some infrastructure fucntions, João Távora, 2018/05/20
- [elpa] externals/eglot 258fb98 12/15: Travis now runs python-language-server tests, João Távora, 2018/05/20
- [elpa] externals/eglot 99686a9 11/15: * eglot.el (Version): Bump to 0.4, João Távora, 2018/05/20
- [elpa] externals/eglot 6894ed7 13/15: Tweak tests, hopefully stabilize pyls tests on Travis, João Távora, 2018/05/20
- [elpa] externals/eglot 4b9f4da 03/15: If we're going to send rootPath, better send an absolute one, João Távora, 2018/05/20
- [elpa] externals/eglot 2ede684 06/15: Better decide what text exactly to present as completions, João Távora, 2018/05/20
- [elpa] externals/eglot 17b7740 05/15: * eglot.el (eglot-clear-status): Remember to update modeline, João Távora, 2018/05/20
- [elpa] externals/eglot b45cb80 02/15: Robustify timer handling for eglot--async-request, João Távora, 2018/05/20
- [elpa] externals/eglot ace6fce 07/15: Check capabilities before sending :completionItem/resolve, João Távora, 2018/05/20
- [elpa] externals/eglot 24877ae 15/15: Fix a bug introduced in the previous commit,
João Távora <=
- [elpa] externals/eglot 95c2052 09/15: Handle managed buffers in own process var, João Távora, 2018/05/20
- [elpa] externals/eglot 433361e 10/15: Add some completion tests for pyls, João Távora, 2018/05/20
- [elpa] externals/eglot 50b974f 14/15: Rewrite a couple of defs and shave a yak, João Távora, 2018/05/20