Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Diff LSP format responses that replace the whole buffer (#57269)

kmdw5d5963361f30
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e53216805b5..412b2db0d43 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -2675,7 +2675,7 @@ impl LocalLspStore {
let lsp_edits = if formatting_supported {
let _timer = zlog::time!(logger => "format-full");
- language_server
+ let response = language_server
.request::<lsp::request::Formatting>(
lsp::DocumentFormattingParams {
text_document,
@@ -2685,7 +2685,42 @@ impl LocalLspStore {
request_timeout,
)
.await
- .into_response()?
+ .into_response()?;
+
+ let Some(edits) = response else {
+ return Ok(vec![]);
+ };
+
+ let buffer_end =
+ buffer.read_with(cx, |buffer, _| point_to_lsp(buffer.max_point_utf16()));
+ let should_apply_diff_based_edits = edits.len() == 1
+ && edits.first().is_some_and(|edit| {
+ edit.range == lsp::Range::new(lsp::Position::new(0, 0), buffer_end)
+ });
+
+ if should_apply_diff_based_edits {
+ let Some(text_edit) = edits.into_iter().next() else {
+ return Ok(vec![]);
+ };
+ let diff = buffer
+ .update(cx, |buffer, cx| buffer.diff(text_edit.new_text, cx))
+ .await;
+ Some(buffer.read_with(cx, |buffer, _| {
+ let rope = buffer.as_rope();
+ diff.edits
+ .into_iter()
+ .map(|(range, text)| TextEdit {
+ range: lsp::Range::new(
+ point_to_lsp(rope.offset_to_point_utf16(range.start)),
+ point_to_lsp(rope.offset_to_point_utf16(range.end)),
+ ),
+ new_text: text.to_string(),
+ })
+ .collect()
+ }))
+ } else {
+ Some(edits).filter(|edits| !edits.is_empty())
+ }
} else if range_formatting_supported {
let _timer = zlog::time!(logger => "format-range");
let buffer_start = lsp::Position::new(0, 0);
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index eec9a983d3b..ee488e76342 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -7965,6 +7965,88 @@ async fn test_range_formatting_prefers_range_capable_current_server(cx: &mut gpu
);
}
+#[gpui::test]
+async fn test_full_buffer_formatting_edit_preserves_unchanged_anchors(
+ cx: &mut gpui::TestAppContext,
+) {
+ init_test(cx);
+ cx.update(|cx| {
+ SettingsStore::update_global(cx, |store, cx| {
+ store.update_user_settings(cx, |settings| {
+ settings.project.all_languages.defaults.formatter = Some(FormatterList::Single(
+ Formatter::LanguageServer(settings::LanguageServerFormatterSpecifier::Current),
+ ));
+ });
+ });
+ });
+
+ let initial_text = "fn main() {\n println!(\"🙂\"); \n}\n";
+ let formatted_text = "fn main() {\n println!(\"🙂\");\n}\n";
+ let fs = FakeFs::new(cx.executor());
+ fs.insert_tree(path!("/dir"), json!({ "main.rs": initial_text }))
+ .await;
+
+ let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+ let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+ language_registry.add(rust_lang());
+ let mut fake_language_servers = language_registry.register_fake_lsp(
+ "Rust",
+ FakeLspAdapter {
+ capabilities: lsp::ServerCapabilities {
+ document_formatting_provider: Some(lsp::OneOf::Left(true)),
+ ..lsp::ServerCapabilities::default()
+ },
+ ..FakeLspAdapter::default()
+ },
+ );
+
+ let (buffer, _handle) = project
+ .update(cx, |project, cx| {
+ project.open_local_buffer_with_lsp(path!("/dir/main.rs"), cx)
+ })
+ .await
+ .unwrap();
+ let fake_server = fake_language_servers.next().await.unwrap();
+ cx.executor().run_until_parked();
+
+ let _format_requests = fake_server.set_request_handler::<lsp::request::Formatting, _, _>({
+ let formatted_text = formatted_text.to_string();
+ move |_, _| {
+ let formatted_text = formatted_text.clone();
+ async move {
+ Ok(Some(vec![lsp::TextEdit {
+ range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(3, 0)),
+ new_text: formatted_text,
+ }]))
+ }
+ }
+ });
+ let unchanged_anchor = buffer.read_with(cx, |buffer, _| {
+ buffer.anchor_before(initial_text.find("println!").unwrap())
+ });
+
+ project
+ .update(cx, |project, cx| {
+ project.format(
+ HashSet::from_iter([buffer.clone()]),
+ project::lsp_store::LspFormatTarget::Buffers,
+ false,
+ project::lsp_store::FormatTrigger::Manual,
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+
+ buffer.read_with(cx, |buffer, _| {
+ assert_eq!(buffer.text(), formatted_text);
+ assert_eq!(
+ unchanged_anchor.to_offset(buffer),
+ formatted_text.find("println!").unwrap()
+ );
+ });
+}
+
#[gpui::test(iterations = 10)]
async fn test_apply_code_actions_with_commands(cx: &mut gpui::TestAppContext) {
init_test(cx);