Always use server formatting settings

Kirill Bulatov created 2 years ago

Change summary

crates/project/src/lsp_command.rs | 16 +++++++---------
crates/rpc/proto/zed.proto        | 11 +++--------
2 files changed, 10 insertions(+), 17 deletions(-)

Detailed changes

crates/project/src/lsp_command.rs

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

crates/rpc/proto/zed.proto

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