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

Match original logic when determining server to request formatting

Browse source
This commit is contained in:
Julia 2023-06-27 14:16:01 -04:00
parent 2a8d1343d6
commit b2de28ccfc
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3895,7 +3895,7 @@ impl Project {
let formatting_provider = capabilities.document_formatting_provider.as_ref(); let formatting_provider = capabilities.document_formatting_provider.as_ref();
let range_formatting_provider = capabilities.document_range_formatting_provider.as_ref(); let range_formatting_provider = capabilities.document_range_formatting_provider.as_ref();
let lsp_edits = if !matches!(formatting_provider, Some(OneOf::Left(false))) { let lsp_edits = if matches!(formatting_provider, Some(p) if *p != OneOf::Left(false)) {
language_server language_server
.request::<lsp::request::Formatting>(lsp::DocumentFormattingParams { .request::<lsp::request::Formatting>(lsp::DocumentFormattingParams {
text_document, text_document,
@ -3903,7 +3903,7 @@ impl Project {
work_done_progress_params: Default::default(), work_done_progress_params: Default::default(),
}) })
.await? .await?
} else if !matches!(range_formatting_provider, Some(OneOf::Left(false))) { } else if matches!(range_formatting_provider, Some(p) if *p != OneOf::Left(false)) {
let buffer_start = lsp::Position::new(0, 0); let buffer_start = lsp::Position::new(0, 0);
let buffer_end = buffer.read_with(cx, |b, _| point_to_lsp(b.max_point_utf16())); let buffer_end = buffer.read_with(cx, |b, _| point_to_lsp(b.max_point_utf16()));