Skip to content

Improve SymbolServer progress reporting #994

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
pfitzseb merged 1 commit into from
Nov 5, 2021
Merged

Improve SymbolServer progress reporting #994

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
13 changes: 7 additions & 6 deletions src/languageserverinstance.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function create_symserver_progress_ui(server)
JSONRPC.send(
server.jr_endpoint,
progress_notification_type,
ProgressParams(token, WorkDoneProgressBegin("Julia Language Server", missing, "Indexing packages...", missing))
ProgressParams(token, WorkDoneProgressBegin("Julia", missing, "Starting async tasks...", 0))
)
end
end
Expand Down Expand Up @@ -176,19 +176,20 @@ function trigger_symbolstore_reload(server::LanguageServerInstance)
end

@async try
# TODO Add try catch handler that links into crash reporting
ssi_ret, payload = SymbolServer.getstore(
server.symbol_server,
server.env_path,
function (i)
function (msg, percentage = missing)
if server.clientcapability_window_workdoneprogress && server.current_symserver_progress_token !== nothing
msg = ismissing(percentage) ? msg : string(msg, " ($percentage%)")
JSONRPC.send(
server.jr_endpoint,
progress_notification_type,
ProgressParams(server.current_symserver_progress_token, WorkDoneProgressReport(missing, "Indexing $i...", missing))
ProgressParams(server.current_symserver_progress_token, WorkDoneProgressReport(missing, msg, percentage))
)
@info msg percentage
else
@info "Indexing $i..."
@info msg percentage
end
end,
server.err_handler,
Expand Down Expand Up @@ -349,9 +350,9 @@ function Base.run(server::LanguageServerInstance)
msg_dispatcher[julia_getDocFromWord_request_type] = request_wrapper(julia_getDocFromWord_request, server)
msg_dispatcher[textDocument_selectionRange_request_type] = request_wrapper(textDocument_selectionRange_request, server)

@debug "starting main loop"
while true
message = take!(server.combined_msg_queue)

if message.type == :close
@info "Shutting down server instance."
return
Expand Down