Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak structure of Project::on_lsp_progress so it can be auto-formatted

Browse source 
Previously, rustfmt seems to have given up on formatting this method.
This commit is contained in:
Max Brunsfeld 2022-04-06 16:35:58 -07:00
parent f9e1b4de96
commit 8f38ac8270
1 changed files with 68 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/project/src/project.rs
View file

@ -1633,17 +1633,17 @@ impl Project {
return; return;
} }
}; };
let progress = match progress.value {
match progress.value { lsp::ProgressParamsValue::WorkDone(value) => value,
lsp::ProgressParamsValue::WorkDone(progress) => match progress { };
lsp::WorkDoneProgress::Begin(_) => {
let language_server_status = let language_server_status =
if let Some(status) = self.language_server_statuses.get_mut(&server_id) { if let Some(status) = self.language_server_statuses.get_mut(&server_id) {
status status
} else { } else {
return; return;
}; };
match progress {
lsp::WorkDoneProgress::Begin(_) => {
if Some(token.as_str()) == disk_based_diagnostics_progress_token { if Some(token.as_str()) == disk_based_diagnostics_progress_token {
language_server_status.pending_diagnostic_updates += 1; language_server_status.pending_diagnostic_updates += 1;
if language_server_status.pending_diagnostic_updates == 1 { if language_server_status.pending_diagnostic_updates == 1 {
@ -1659,9 +1659,9 @@ impl Project {
self.on_lsp_work_start(server_id, token.clone(), cx); self.on_lsp_work_start(server_id, token.clone(), cx);
self.broadcast_language_server_update( self.broadcast_language_server_update(
server_id, server_id,
proto::update_language_server::Variant::WorkStart( proto::update_language_server::Variant::WorkStart(proto::LspWorkStart {
proto::LspWorkStart { token }, token,
), }),
); );
} }
} }
@ -1691,14 +1691,6 @@ impl Project {
} }
lsp::WorkDoneProgress::End(_) => { lsp::WorkDoneProgress::End(_) => {
if Some(token.as_str()) == disk_based_diagnostics_progress_token { if Some(token.as_str()) == disk_based_diagnostics_progress_token {
let language_server_status = if let Some(status) =
self.language_server_statuses.get_mut(&server_id)
{
status
} else {
return;
};
language_server_status.pending_diagnostic_updates -= 1; language_server_status.pending_diagnostic_updates -= 1;
if language_server_status.pending_diagnostic_updates == 0 { if language_server_status.pending_diagnostic_updates == 0 {
self.disk_based_diagnostics_finished(cx); self.disk_based_diagnostics_finished(cx);
@ -1719,7 +1711,6 @@ impl Project {
); );
} }
} }
},
} }
} }