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

Optimize overlay creation by checking window visibility first #4511

Merged
merged 2 commits into from
Sep 23, 2024
Merged

Optimize overlay creation by checking window visibility first #4511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f57fd3e
Refactor lsp--document-highlight-callback to check window visibility …
eval-exec Jul 28, 2024
8224a78
Merge branch 'master' into exec/improve-lsp--document-highlight-callback
eval-exec Sep 23, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* Added a new optional ~:action-filter~ argument when defining LSP clients that allows code action requests to be modified before they are sent to the server. This is used by the Haskell language server client to work around an ~lsp-mode~ parsing quirk that incorrectly sends ~null~ values instead of ~false~ in code action requests.
* Add support for C# via the [[https://github.com/dotnet/roslyn/tree/main/src/LanguageServer][Roslyn language server]].
* Add basic support for [[https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_pullDiagnostics][pull diagnostics]] requests.
* Optimize overlay creation by checking window visibility first

** 9.0.0
* Add language server config for QML (Qt Modeling Language) using qmlls.
Expand Down
18 changes: 9 additions & 9 deletions lsp-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6260,15 +6260,15 @@ A reference is highlighted only if it is visible in a window."
(-map
(-lambda ((start-window . end-window))
;; Make the overlay only if the reference is visible
(let ((start-point (lsp--position-to-point start))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think (lsp--position-to-point start) and (lsp--position-to-point end) is a heavy job.

(end-point (lsp--position-to-point end)))
(when (and (> (1+ start-line) start-window)
(< (1+ end-line) end-window)
(not (and lsp-symbol-highlighting-skip-current
(<= start-point (point) end-point))))
(-doto (make-overlay start-point end-point)
(overlay-put 'face (cdr (assq (or kind? 1) lsp--highlight-kind-face)))
(overlay-put 'lsp-highlight t)))))
(when (and (> (1+ start-line) start-window)
(< (1+ end-line) end-window))
(let ((start-point (lsp--position-to-point start))
(end-point (lsp--position-to-point end)))
(when (not (and lsp-symbol-highlighting-skip-current
(<= start-point (point) end-point)))
(-doto (make-overlay start-point end-point)
(overlay-put 'face (cdr (assq (or kind? 1) lsp--highlight-kind-face)))
(overlay-put 'lsp-highlight t))))))
wins-visible-pos))
highlights)))

Expand Down
Loading