andras/reconcile
andras/reconcile
Watch
1
0
Fork
You've already forked reconcile
 0
Code Issues Pull requests 10 Projects Releases Packages Wiki Activity Actions

Revert oversimplifications
All checks were successful
Check and publish / build (push) Successful in 11m5s
Details
Check and publish / publish-crate (push) Has been skipped
Details
Check and publish / publish-pypi (push) Has been skipped
Details

Browse source
This commit is contained in:
Andras Schmelczer 2026-10-29 22:42:31 +00:00
commit 5170bf02ca
1 changed files with 72 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tests/example_document.rs
View file

@ -40,10 +40,9 @@ impl ExampleDocument {
/// If the result string does not match the expected string, the program
/// will panic.
pub fn assert_eq(&self, result: &EditedText<'_, String>) {
let result_str = ExampleDocument::text_with_cursors_to_string(result);
assert_eq!(
self.expected, result_str,
"Left (expected) isn't equal to right (actual). Actual: ```\n{result_str}```",
Self::string_to_text_with_cursors(&self.expected),
result.apply()
);
}
@ -62,30 +61,6 @@ impl ExampleDocument {
);
}
fn text_with_cursors_to_string(document: &EditedText<'_, String>) -> String {
let merged = document.apply();
let mut result = merged.text();
for (i, cursor) in merged.cursors().iter().enumerate() {
assert!(
cursor.char_index() <= result.len(), // equals in case of insert at the end
"Cursor index out of bounds: {} > {} when testing for '{}.'",
cursor.char_index(),
result.len(),
result
);
result.insert(
result
.char_indices()
.nth(cursor.char_index() + i)
.map_or_else(|| result.len(), |(byte_index, _)| byte_index), /* find the utf8 char index of the insert
* in byte index */
'|',
);
}
result
}
fn string_to_text_with_cursors(text: &str) -> TextWithCursors {
let cursors = Self::parse_cursors(text);
let text = text.replace('|', "");