Skip to content

Address #2448 #2790

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

Merged
merged 12 commits into from
Jul 10, 2021
Merged

Address #2448 #2790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f564808
Address #2448
Jan 23, 2021
b3f9623
Fix misassigned defcustom groups
Apr 19, 2021
ca0d0f4
Fix byte-compiler warning
Apr 19, 2021
819a023
Add debugging helper methods
Apr 25, 2021
d3b85b3
Don't assume lsp-put to modify its argument
May 1, 2021
ee13bb2
Don't assume plist-put to modify its argument
May 1, 2021
2135ae3
Remove unused cache member
May 1, 2021
c48241b
Annotate buffer snapshots with response data
May 1, 2021
80bd6fa
Always store tokens cache as plist
May 2, 2021
f95041d
Autosuggest semhl face overrides
May 2, 2021
993a66e
Move misplaced semanticTokens/refresh handler
Jun 27, 2021
c60797a
Fix some byte compiler warnings
Jun 27, 2021
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
16 changes: 12 additions & 4 deletions lsp-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,8 +832,12 @@ directory")
("textDocument/semanticTokensFull"
:check-command (lambda (workspace)
(with-lsp-workspace workspace
(lsp-get (lsp--capability :semanticTokensProvider)
:full))))
(lsp-get (lsp--capability :semanticTokensProvider) :full))))
("textDocument/semanticTokensFull/Delta"
:check-command (lambda (workspace)
(with-lsp-workspace workspace
(let ((capFull (lsp-get (lsp--capability :semanticTokensProvider) :full)))
(and (not (booleanp capFull)) (lsp-get capFull :delta))))))
("textDocument/semanticTokensRangeProvider"
:check-command (lambda (workspace)
(with-lsp-workspace workspace
Expand Down Expand Up @@ -3335,7 +3339,7 @@ disappearing, unset all the variables related to it."
,@(when lsp-enable-file-watchers '((didChangeWatchedFiles . ((dynamicRegistration . t)))))
(workspaceFolders . t)
(configuration . t)
,@(when lsp-semantic-tokens-enable '((semanticTokens . ((refreshSupport . :json-false)))))
,@(when lsp-semantic-tokens-enable '((semanticTokens . ((refreshSupport . t)))))
,@(when lsp-lens-enable '((codeLens . ((refreshSupport . :json-false)))))
(fileOperations . ((didCreate . :json-false)
(willCreate . :json-false)
Expand Down Expand Up @@ -6033,7 +6037,6 @@ textDocument/didOpen for the new file."
(defconst lsp--default-notification-handlers
(ht ("window/showMessage" #'lsp--window-show-message)
("window/logMessage" #'lsp--window-log-message)
("workspace/semanticTokens/refresh" #'ignore)
("textDocument/publishDiagnostics" #'lsp--on-diagnostics)
("textDocument/diagnosticsEnd" #'ignore)
("textDocument/diagnosticsBegin" #'ignore)
Expand Down Expand Up @@ -6157,6 +6160,11 @@ WORKSPACE is the active workspace."
((equal method "window/workDoneProgress/create")
nil ;; no specific reply, no processing required
)
((equal method "workspace/semanticTokens/refresh")
(when (and lsp-semantic-tokens-enable
(fboundp 'lsp--semantic-tokens-on-refresh))
(lsp--semantic-tokens-on-refresh))
nil)
(t (lsp-warn "Unknown request method: %s" method) nil))))
;; Send response to the server.
(unless (eq response 'delay-response)
Expand Down
6 changes: 5 additions & 1 deletion lsp-protocol.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,11 @@ See `-let' for a description of the destructuring mechanism."
(WorkDoneProgressOptions nil (:workDoneProgress))
(SemanticTokensOptions (:legend) (:rangeProvider :documentProvider))
(SemanticTokensLegend (:tokenTypes :tokenModifiers))
(SematicTokensPartialResult (:data) nil))
(SemanticTokensResult (:resultId) (:data))
(SemanticTokensPartialResult nil (:data))
(SemanticTokensEdit (:start :deleteCount) (:data))
(SemanticTokensDelta (:resultId) (:edits))
(SemanticTokensDeltaPartialResult nil (:edits)))

(lsp-interface (v1:ProgressParams (:id :title) (:message :percentage :done)))

Expand Down
Loading