rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Check client capabilities before sending progress notifications

Browse Source 
Fixes #4384
This commit is contained in:
Jeremy Kolb
2020-05-09 17:15:22 -04:00
committed by kjeremy
parent 05399250d4
commit d4471dccfe
4 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/rust-analyzer/src/main_loop.rs
View File

@@ -415,7 +415,8 @@ fn loop_turn(
});
}
let show_progress = !loop_state.workspace_loaded;
let show_progress =
!loop_state.workspace_loaded && world_state.config.client_caps.work_done_progress;
if !loop_state.workspace_loaded
&& loop_state.roots_scanned == loop_state.roots_total
@@ -750,12 +751,16 @@ fn on_check_task(
}
CheckTask::Status(progress) => {
let params = lsp_types::ProgressParams {
token: lsp_types::ProgressToken::String("rustAnalyzer/cargoWatcher".to_string()),
value: lsp_types::ProgressParamsValue::WorkDone(progress),
};
let not = notification_new::<lsp_types::notification::Progress>(params);
task_sender.send(Task::Notify(not)).unwrap();
if world_state.config.client_caps.work_done_progress {
let params = lsp_types::ProgressParams {
token: lsp_types::ProgressToken::String(
"rustAnalyzer/cargoWatcher".to_string(),
),
value: lsp_types::ProgressParamsValue::WorkDone(progress),
};
let not = notification_new::<lsp_types::notification::Progress>(params);
task_sender.send(Task::Notify(not)).unwrap();
}
}
};