Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore carriage returns when reloading buffer

Browse source
This commit is contained in:
Antonio Scandurra 2022-07-04 17:40:35 +02:00
parent 3480b50920
commit d80ecb6f98
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/language/src/buffer.rs
View file

@ -554,7 +554,7 @@ impl Buffer {
}) { }) {
let new_text = new_text.await?; let new_text = new_text.await?;
let diff = this let diff = this
.read_with(&cx, |this, cx| this.diff(new_text.into(), cx)) .read_with(&cx, |this, cx| this.diff(new_text, cx))
.await; .await;
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
if let Some(transaction) = this.apply_diff(diff, cx).cloned() { if let Some(transaction) = this.apply_diff(diff, cx).cloned() {
@ -968,18 +968,19 @@ impl Buffer {
} }
} }
pub(crate) fn diff(&self, new_text: Arc<str>, cx: &AppContext) -> Task<Diff> { pub(crate) fn diff(&self, new_text: String, cx: &AppContext) -> Task<Diff> {
// TODO: it would be nice to not allocate here. let old_text = self.as_rope().clone();
let old_text = self.text();
let base_version = self.version(); let base_version = self.version();
cx.background().spawn(async move { cx.background().spawn(async move {
let changes = TextDiff::from_lines(old_text.as_str(), new_text.as_ref()) let old_text = old_text.to_string();
let new_text = new_text.replace("\r\n", "\n").replace('\r', "\n");
let changes = TextDiff::from_lines(old_text.as_str(), new_text.as_str())
.iter_all_changes() .iter_all_changes()
.map(|c| (c.tag(), c.value().len())) .map(|c| (c.tag(), c.value().len()))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
Diff { Diff {
base_version, base_version,
new_text, new_text: new_text.into(),
changes, changes,
start_offset: 0, start_offset: 0,
} }