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

Normalize line endings when parsing completions

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-07-06 19:32:45 +02:00
parent d3db700db4
commit 2c1906d710
5 changed files with 65 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/text/src/tests.rs
View file

@ -43,7 +43,7 @@ fn test_random_edits(mut rng: StdRng) {
.take(reference_string_len)
.collect::<String>();
let mut buffer = Buffer::new(0, 0, reference_string.clone().into());
LineEnding::strip_carriage_returns(&mut reference_string);
LineEnding::normalize(&mut reference_string);
buffer.history.group_interval = Duration::from_millis(rng.gen_range(0..=200));
let mut buffer_versions = Vec::new();

8
crates/text/src/text.rs
View file

@ -555,7 +555,7 @@ pub struct UndoOperation {
impl Buffer {
pub fn new(replica_id: u16, remote_id: u64, mut base_text: String) -> Buffer {
let line_ending = LineEnding::detect(&base_text);
LineEnding::strip_carriage_returns(&mut base_text);
LineEnding::normalize(&mut base_text);
let history = History::new(base_text.into());
let mut fragments = SumTree::new();
@ -691,7 +691,7 @@ impl Buffer {
let mut fragment_start = old_fragments.start().visible;
for (range, new_text) in edits {
let new_text = LineEnding::strip_carriage_returns_from_arc(new_text.into());
let new_text = LineEnding::normalize_arc(new_text.into());
let fragment_end = old_fragments.end(&None).visible;
// If the current fragment ends before this range, then jump ahead to the first fragment
@ -2385,13 +2385,13 @@ impl LineEnding {
}
}
pub fn strip_carriage_returns(text: &mut String) {
pub fn normalize(text: &mut String) {
if let Cow::Owned(replaced) = CARRIAGE_RETURNS_REGEX.replace_all(text, "\n") {
*text = replaced;
}
}
fn strip_carriage_returns_from_arc(text: Arc<str>) -> Arc<str> {
fn normalize_arc(text: Arc<str>) -> Arc<str> {
if let Cow::Owned(replaced) = CARRIAGE_RETURNS_REGEX.replace_all(&text, "\n") {
replaced.into()
} else {