[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eglot d5521e9 12/22: Remove workaround for company bug
From: |
João Távora |
Subject: |
[elpa] externals/eglot d5521e9 12/22: Remove workaround for company bug that has been fixed |
Date: |
Sat, 5 Jan 2019 09:31:03 -0500 (EST) |
branch: externals/eglot
commit d5521e94f37d8d50b2029fdb3f540de8b9affac8
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Remove workaround for company bug that has been fixed
See https://github.com/company-mode/company-mode/pull/845.
* eglot.el (eglot-completion-at-point): Remove workaround for
company-mode bug.
---
eglot.el | 36 ++++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/eglot.el b/eglot.el
index 108e7f0..53a52bf 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1822,22 +1822,19 @@ is not active."
:deferred :textDocument/completion
:cancel-on-input t))
(items (if (vectorp resp) resp (plist-get resp :items))))
- (setq
- strings
- (mapcar
- (jsonrpc-lambda (&rest all &key label insertText insertTextFormat
- &allow-other-keys)
- (let ((completion
- (cond ((and (eql insertTextFormat 2)
- (eglot--snippet-expansion-fn))
- (string-trim-left label))
- (t
- (or insertText (string-trim-left label))))))
- (add-text-properties 0 1 all completion)
- (put-text-property 0 1 'eglot--completion-bounds bounds
completion)
- (put-text-property 0 1 'eglot--lsp-completion all completion)
- completion))
- items)))))
+ (mapcar
+ (jsonrpc-lambda (&rest all &key label insertText insertTextFormat
+ &allow-other-keys)
+ (let ((completion
+ (cond ((and (eql insertTextFormat 2)
+ (eglot--snippet-expansion-fn))
+ (string-trim-left label))
+ (t
+ (or insertText (string-trim-left label))))))
+ (add-text-properties 0 1 all completion)
+ (put-text-property 0 1 'eglot--lsp-completion all completion)
+ completion))
+ items))))
:annotation-function
(lambda (obj)
(eglot--dbind ((CompletionItem) detail kind insertTextFormat)
@@ -1898,12 +1895,7 @@ is not active."
additionalTextEdits)
(get-text-property 0 'eglot--lsp-completion comp)
(let ((snippet-fn (and (eql insertTextFormat 2)
- (eglot--snippet-expansion-fn)))
- ;; FIXME: it would have been much easier to fetch
- ;; these from the lexical environment, but we can't
- ;; in company because of
- ;; https://github.com/company-mode/company-mode/pull/845
- (bounds (get-text-property 0 'eglot--completion-bounds
comp)))
+ (eglot--snippet-expansion-fn))))
(cond (textEdit
;; Undo the just the completed bit. If before
;; completion the buffer was "foo.b" and now is
- [elpa] externals/eglot updated (23accee -> 35597d2), João Távora, 2019/01/05
- [elpa] externals/eglot cc5ef6c 02/22: Apply eglot--format-markup to signature documentation, João Távora, 2019/01/05
- [elpa] externals/eglot d77b447 04/22: Adjust active param highlighting in first line of signature (2/3), João Távora, 2019/01/05
- [elpa] externals/eglot ef95839 05/22: Adjust active param highlighting in first line of signature (3/3), João Távora, 2019/01/05
- [elpa] externals/eglot 64c7605 03/22: Adjust active param highlighting in first line of signature (1/3), João Távora, 2019/01/05
- [elpa] externals/eglot e8b9cbf 16/22: Slightly simplify eglot-completion-at-point, João Távora, 2019/01/05
- [elpa] externals/eglot d5521e9 12/22: Remove workaround for company bug that has been fixed,
João Távora <=
- [elpa] externals/eglot d167c80 15/22: Fix #190: actually make completion sorting work, João Távora, 2019/01/05
- [elpa] externals/eglot 476feb8 07/22: Add edebug specs to destructuring macros, João Távora, 2019/01/05
- [elpa] externals/eglot b8a8901 09/22: Fix #187: be more careful when making xref summaries, João Távora, 2019/01/05
- [elpa] externals/eglot 2f0e51a 13/22: Per #188: use gfm-view-mode, João Távora, 2019/01/05
- [elpa] externals/eglot b393c48 14/22: Fix previous commit where workaround had been removed, João Távora, 2019/01/05
- [elpa] externals/eglot 64da240 19/22: Fix #196: run connection hooks with proper dir-locals, João Távora, 2019/01/05
- [elpa] externals/eglot af9dcad 10/22: Take over Flymake and Eldoc completely while managing buffers, João Távora, 2019/01/05
- [elpa] externals/eglot 5b9a164 01/22: Per #180: frame lsp-mode.el comparison as historical even more evidently, João Távora, 2019/01/05
- [elpa] externals/eglot 7b0d845 17/22: Close #195: remove a hard dependency on flymake-mode, João Távora, 2019/01/05
- [elpa] externals/eglot 923cbbe 08/22: Don't make bogus responses to client/(Un)RegisterCapability, João Távora, 2019/01/05