Skip to content

Don't use `lsp-execute-command' #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't use `lsp-execute-command' #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8de83e4
Don't use `lsp-execute-command'
nbfalcon Nov 4, 2020
1b04d4d
Fix `ccls--show-xrefs'
nbfalcon Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ccls.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,10 @@ DIRECTION can be \"D\", \"L\", \"R\" or \"U\"."
ccls-root-files))
(expand-file-name dir))))

(cl-defmethod lsp-execute-command
((_server (eql ccls)) (command (eql ccls.xref)) arguments)
(lsp-defun ccls--show-xrefs ((&Command :command :arguments?))
(when-let ((xrefs (lsp--locations-to-xref-items
(lsp--send-execute-command command arguments))))
(xref--show-xrefs xrefs nil)))
(lsp--send-execute-command command arguments?))))
(lsp-show-xrefs xrefs nil t)))

(advice-add 'lsp--suggest-project-root :before-until #'ccls--suggest-project-root)

Expand All @@ -162,6 +161,7 @@ DIRECTION can be \"D\", \"L\", \"R\" or \"U\"."
:notification-handlers
(lsp-ht ("$ccls/publishSkippedRanges" #'ccls--publish-skipped-ranges)
("$ccls/publishSemanticHighlight" #'ccls--publish-semantic-highlight))
:action-handlers (lsp-ht ("ccls.xref" #'ccls--show-xrefs))
:initialization-options (lambda () ccls-initialization-options)
:library-folders-fn ccls-library-folders-fn))

Expand Down