Skip to content
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

Jump to bottom

Add lsp-ivy-document-symbol #38

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

Add lsp-ivy-document-symbol #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0862da
Add lsp-ivy-document-symbol
razzmatazz Sep 21, 2022
77044e8
lsp-ivy-document-symbol: fix doc string
razzmatazz Oct 1, 2022
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
54 changes: 53 additions & 1 deletion lsp-ivy.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
;; Oliver Rausch
;; Keywords: languages, debug
;; URL: https://github.com/emacs-lsp/lsp-ivy
;; Package-Requires: ((emacs "25.1") (dash "2.14.1") (lsp-mode "6.2.1") (ivy "0.13.0"))
;; Package-Requires: ((emacs "27.1") (dash "2.14.1") (lsp-mode "6.2.1") (ivy "0.13.0"))
Copy link
Author

@razzmatazz razzmatazz Oct 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

27.1 is required for flatten-tree -- I can probably drop it and rewrite it differently if needed

;; Version: 0.5
;;

Expand Down Expand Up @@ -213,6 +213,58 @@ When called with prefix ARG the default selection will be symbol at point."



(lsp-defun lsp-ivy--format-document-symbol-match (dsym)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may handle deprecated as well. And using lsp-defun does not make sense if you don't destructure in the params.

Consider integrating with treemacs icons (you may check for lsp-treemacs and use the helpers from there).
Consider optionally adding the possibility to indicate the parent/child relation using identation.

"Convert the DocumentSymbol match returned by `lsp-mode` into a list of this node
and children nodes."
(-let* (((&DocumentSymbol :kind :name :selection-range :children? :detail?) dsym)
(sanitized-kind (if (< kind (length lsp-ivy-symbol-kind-to-face)) kind 0))
(type (elt lsp-ivy-symbol-kind-to-face sanitized-kind))
(typestr (if lsp-ivy-show-symbol-kind
(propertize (format "[%s] " (car type)) 'face (cdr type))
""))
(symstr (format "%s%s%s" typestr
name
(if detail? (format " · %s" (propertize detail? 'face font-lock-comment-face)) "")))
(propertized-symstr (propertize symstr
'lsp-ivy-symbol-uri lsp-buffer-uri
'lsp-ivy-symbol-range selection-range))
(children-symstrs (seq-map #'lsp-ivy--format-document-symbol-match children?)))
(list propertized-symstr children-symstrs)))

(defun lsp-ivy--document-symbol-action (sym-string)
"Jump to the symbol referenced in SYM-STRING."
(-let* ((range (get-text-property 0 'lsp-ivy-symbol-range sym-string))
((&Range :start) range)
((&Position :character :line) start)
(uri (get-text-property 0 'lsp-ivy-symbol-uri sym-string)))
(find-file (lsp--uri-to-path uri))
(goto-char (point-min))
(forward-line line)
(forward-char character)))

(defun lsp-ivy-document-symbol ()
"`ivy' for lsp textDocument/documentSymbol."
(interactive)
(let* ((xs (lsp-request-while-no-input "textDocument/documentSymbol"
(lsp--text-document-position-params)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you should use this method. IMHO it should be async and it should let the user type while the query runs.

(xs-type (if (not xs)
'DocumentSymbol
(-let (((&DocumentSymbol :range) (car xs)))
(if range
'DocumentSymbol
'SymbolInformation))))
(workspace-root (lsp-workspace-root))
(ts (if (eq xs-type 'DocumentSymbol)
(flatten-tree (lsp-ivy--format-document-symbol-match (car xs)))
(seq-map #'(lambda (x) (lsp-ivy--format-symbol-match x workspace-root)) xs))))
(ivy-read "Document symbols: "
ts
:require-match t
:action #'lsp-ivy--document-symbol-action
:caller 'lsp-ivy-document-symbol)))



;;;###autoload
(defun lsp-ivy-workspace-folders-remove ()
"Remove a project-root from the list of workspace folders."
Expand Down