zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-06 03:00:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #533 from zed-industries/range-formatting

Browse Source 
Use LSP range formatting when document formatting is not available
This commit is contained in:
Antonio Scandurra 2022-03-04 16:12:59 +01:00 committed by GitHub
commit 82e4544846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/lsp/src/lsp.rs
View File

@ -524,6 +524,8 @@ impl LanguageServer {
ServerCapabilities {
document_highlight_provider: Some(OneOf::Left(true)),
code_action_provider: Some(CodeActionProviderCapability::Simple(true)),
document_formatting_provider: Some(OneOf::Left(true)),
document_range_formatting_provider: Some(OneOf::Left(true)),
..Default::default()
}
}

50
crates/project/src/project.rs
View File

@ -1314,15 +1314,47 @@ impl Project {
}
for (buffer, buffer_abs_path, lang_server) in local_buffers {
let lsp_edits = lang_server
.request::<lsp::request::Formatting>(lsp::DocumentFormattingParams {
text_document: lsp::TextDocumentIdentifier::new(
lsp::Url::from_file_path(&buffer_abs_path).unwrap(),
),
options: Default::default(),
work_done_progress_params: Default::default(),
})
.await?;
let capabilities = if let Some(capabilities) = lang_server.capabilities().await {
capabilities
} else {
continue;
};
let text_document = lsp::TextDocumentIdentifier::new(
lsp::Url::from_file_path(&buffer_abs_path).unwrap(),
);
let lsp_edits = if capabilities
.document_formatting_provider
.map_or(false, |provider| provider != lsp::OneOf::Left(false))
{
lang_server
.request::<lsp::request::Formatting>(lsp::DocumentFormattingParams {
text_document,
options: Default::default(),
work_done_progress_params: Default::default(),
})
.await?
} else if capabilities
.document_range_formatting_provider
.map_or(false, |provider| provider != lsp::OneOf::Left(false))
{
let buffer_start = lsp::Position::new(0, 0);
let buffer_end = buffer
.read_with(&cx, |buffer, _| buffer.max_point_utf16())
.to_lsp_position();
lang_server
.request::<lsp::request::RangeFormatting>(
lsp::DocumentRangeFormattingParams {
text_document,
range: lsp::Range::new(buffer_start, buffer_end),
options: Default::default(),
work_done_progress_params: Default::default(),
},
)
.await?
} else {
continue;
};
if let Some(lsp_edits) = lsp_edits {
let edits = buffer

4
crates/text/src/rope.rs
View File

@ -126,6 +126,10 @@ impl Rope {
self.chunks.extent(&())
}
pub fn max_point_utf16(&self) -> PointUtf16 {
self.chunks.extent(&())
}
pub fn cursor(&self, offset: usize) -> Cursor {
Cursor::new(self, offset)
}

4
crates/text/src/text.rs
View File

@ -1526,6 +1526,10 @@ impl BufferSnapshot {
self.visible_text.max_point()
}
pub fn max_point_utf16(&self) -> PointUtf16 {
self.visible_text.max_point_utf16()
}
pub fn point_to_offset(&self, point: Point) -> usize {
self.visible_text.point_to_offset(point)
}