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

[Fix emacs-lsp/lsp-ui#452] Fix markdown link navigation in *lsp-help* buffers #3844

Merged
merged 5 commits into from
Dec 16, 2022
Merged

[Fix emacs-lsp/lsp-ui#452] Fix markdown link navigation in *lsp-help* buffers #3844

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f576d2e
Fix markdown link navigation in *lsp-help* buffers
vspinu Dec 10, 2022
1cdb46c
Treat all markdown link types the same
vspinu Dec 10, 2022
ef4e686
Inhibit read-only in lsp--fix-markdown-links
vspinu Dec 11, 2022
c66beaf
Use markdown-find-next-prop instead of text-property-search-forward
vspinu Dec 11, 2022
9fefdd7
Start searching from point-min in lsp--fix-markdown-links
vspinu Dec 13, 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
39 changes: 35 additions & 4 deletions lsp-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5158,9 +5158,12 @@ If EXCLUDE-DECLARATION is non-nil, request the server to include declarations."
`(,buffer ,(posn-point event))
`(,(current-buffer) ,(point)))]
(with-current-buffer buffer
;; Markdown-mode puts the url in 'help-echo
(-some-> (get-text-property point 'help-echo)
(lsp--document-link-handle-target))))))
(when-let* ((face (get-text-property point 'face))
(url (or (and (eq face 'markdown-link-face)
(get-text-property point 'help-echo))
(and (memq face '(markdown-url-face markdown-plain-url-face))
(nth 3 (markdown-link-at-pos point))))))
(lsp--document-link-handle-target url))))))

(defvar lsp-help-mode-map
(-doto (make-sparse-keymap)
Expand Down Expand Up @@ -5218,6 +5221,32 @@ MODE is the mode used in the parent frame."
(lambda (_start _end _match) t))
(prettify-symbols-mode 1))

(defvar lsp-help-link-keymap
(let ((map (make-sparse-keymap)))
(define-key map [mouse-2] #'lsp--help-open-link)
(define-key map "\r" #'lsp--help-open-link)
map)
"Keymap active on links in *lsp-help* mode.")

(defun lsp--fix-markdown-links ()
(let ((inhibit-read-only t)
(inhibit-modification-hooks t)
(prop))
(save-restriction
(goto-char (point-min))
(while (setq prop (markdown-find-next-prop 'face))
(let ((end (next-single-property-change (car prop) 'face)))
(when (memq (get-text-property (car prop) 'face)
'(markdown-link-face
markdown-url-face
markdown-plain-url-face))
(add-text-properties (car prop) end
(list 'button t
'category 'lsp-help-link
'follow-link t
'keymap lsp-help-link-keymap)))
(goto-char end))))))

(defun lsp--buffer-string-visible ()
"Return visible buffer string.
Stolen from `org-copy-visible'."
Expand Down Expand Up @@ -5338,7 +5367,9 @@ In addition, each can have property:
;;
;; See #2984
(ignore-errors (font-lock-ensure))
(lsp--display-inline-image mode))
(lsp--display-inline-image mode)
(when (eq mode 'lsp--render-markdown)
(lsp--fix-markdown-links)))
(lsp--buffer-string-visible))
(error str))))

Expand Down