Skip to content

Fix lsp-ui-sideline-apply-code-actions for multi-line titles #126

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 1 commit into
base: master
Choose a base branch
from
Open

Fix lsp-ui-sideline-apply-code-actions for multi-line titles #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions lsp-ui-sideline.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@ CURRENT is non-nil when the point is on the symbol."
(overlay-put ov 'after-string string)
(push ov lsp-ui-sideline--ovs))))))

(defun lsp-ui-sideline--code-action-title (action)
(replace-regexp-in-string "[\n\t ]+" " " (gethash "title" action)))

(defvar-local lsp-ui-sideline--code-actions nil)

(defun lsp-ui-sideline-apply-code-actions nil
Expand All @@ -340,9 +343,9 @@ CURRENT is non-nil when the point is on the symbol."
(unless lsp-ui-sideline--code-actions
(user-error "No code actions on the current line"))
(let* ((actions lsp-ui-sideline--code-actions)
(title (completing-read "Apply: " (--map (gethash "title" it) actions)
(title (completing-read "Apply: " (-map #'lsp-ui-sideline--code-action-title actions)
nil t))
(action (--first (equal (gethash "title" it) title) actions)))
(action (--first (equal (lsp-ui-sideline--code-action-title it) title) actions)))
(unless action
(error "Fail to apply action"))
(lsp-execute-code-action action)))
Expand All @@ -351,8 +354,7 @@ CURRENT is non-nil when the point is on the symbol."
"Show code ACTIONS."
(setq lsp-ui-sideline--code-actions actions)
(dolist (action actions)
(-let* ((title (->> (gethash "title" action)
(replace-regexp-in-string "[\n\t ]+" " ")
(-let* ((title (->> (lsp-ui-sideline--code-action-title action)
(concat lsp-ui-sideline-code-actions-prefix)))
(margin (lsp-ui-sideline--margin-width))
(keymap (let ((map (make-sparse-keymap)))
Expand Down