From 8c2cc4301742d9d759a8c2964ade0719d4b15645 Mon Sep 17 00:00:00 2001 From: Kirawi <67773714+kirawi@users.noreply.github.com> Date: Sun, 2 Oct 2022 15:23:23 -0400 Subject: [PATCH] diff full-doc LSP edits (#4041) Co-authored-by: Michael Davis --- helix-lsp/src/lib.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs index cb2343573..0717fc04f 100644 --- a/helix-lsp/src/lib.rs +++ b/helix-lsp/src/lib.rs @@ -204,6 +204,20 @@ pub mod util { // in reverse order. edits.sort_unstable_by_key(|edit| edit.range.start); + // Generate a diff if the edit is a full document replacement. + #[allow(clippy::collapsible_if)] + if edits.len() == 1 { + let is_document_replacement = edits.first().and_then(|edit| { + let start = lsp_pos_to_pos(doc, edit.range.start, offset_encoding)?; + let end = lsp_pos_to_pos(doc, edit.range.end, offset_encoding)?; + Some(start..end) + }) == Some(0..doc.len_chars()); + if is_document_replacement { + let new_text = Rope::from(edits.pop().unwrap().new_text); + return helix_core::diff::compare_ropes(doc, &new_text); + } + } + Transaction::change( doc, edits.into_iter().map(|edit| {