zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Always use server formatting settings

Browse Source
This commit is contained in:
Kirill Bulatov 2023-05-23 22:58:40 +03:00
parent d1f4b60fa1
commit 58a56bdda2
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/project/src/lsp_command.rs
View File

@ -8,6 +8,7 @@ use client::proto::{self, PeerId};
use fs::LineEnding; use fs::LineEnding;
use gpui::{AppContext, AsyncAppContext, ModelHandle}; use gpui::{AppContext, AsyncAppContext, ModelHandle};
use language::{ use language::{
language_settings::language_settings,
point_from_lsp, point_to_lsp, point_from_lsp, point_to_lsp,
proto::{deserialize_anchor, deserialize_version, serialize_anchor, serialize_version}, proto::{deserialize_anchor, deserialize_version, serialize_anchor, serialize_version},
range_from_lsp, range_to_lsp, Anchor, Bias, Buffer, CachedLspAdapter, CharKind, CodeAction, range_from_lsp, range_to_lsp, Anchor, Bias, Buffer, CachedLspAdapter, CharKind, CodeAction,
@ -1680,9 +1681,6 @@ impl LspCommand for OnTypeFormatting {
proto::OnTypeFormatting { proto::OnTypeFormatting {
project_id, project_id,
buffer_id: buffer.remote_id(), buffer_id: buffer.remote_id(),
options: Some(proto::FormattingOptions {
tab_size: self.options.tab_size,
}),
position: Some(language::proto::serialize_anchor( position: Some(language::proto::serialize_anchor(
&buffer.anchor_before(self.position), &buffer.anchor_before(self.position),
)), )),
@ -1707,15 +1705,15 @@ impl LspCommand for OnTypeFormatting {
}) })
.await?; .await?;
let tab_size = buffer.read_with(&cx, |buffer, cx| {
let language_name = buffer.language().map(|language| language.name());
language_settings(language_name.as_deref(), cx).tab_size
});
Ok(Self { Ok(Self {
position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer)), position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer)),
trigger: message.trigger.clone(), trigger: message.trigger.clone(),
options: message options: lsp_formatting_options(tab_size.get()).into(),
.options
.map(|options| options.tab_size)
.map(lsp_formatting_options)
.unwrap_or_default()
.into(),
}) })
} }

11
crates/rpc/proto/zed.proto
View File

@ -676,14 +676,9 @@ message PerformRename {
message OnTypeFormatting { message OnTypeFormatting {
uint64 project_id = 1; uint64 project_id = 1;
uint64 buffer_id = 2; uint64 buffer_id = 2;
FormattingOptions options = 3; Anchor position = 3;
Anchor position = 4; string trigger = 4;
string trigger = 5; repeated VectorClockEntry version = 5;
repeated VectorClockEntry version = 6;
}
message FormattingOptions {
uint32 tab_size = 1;
} }
message OnTypeFormattingResponse { message OnTypeFormattingResponse {