Add diff applying error & improve CI (#32)
* Use stable rust * Add From impls * Revert to nightly * Improve dev env & CI setup * Update lock * Add thiserror * Add diff error * Fix tests * Lint * Rename NumberOrString * Format * Fix lint script
This commit is contained in:
parent
e03b9147df
commit
88d48afce3
1 changed files with 195 additions and 1192 deletions
|
|
@ -105,16 +105,17 @@ pub fn diff(parent: &str, changed: &TextWithCursors, tokenizer: BuiltinTokenizer
|
|||
pub fn undiff(parent: &str, diff: Vec<JsValue>, tokenizer: BuiltinTokenizer) -> String {
|
||||
set_panic_hook();
|
||||
|
||||
EditedText::from_diff(
|
||||
match EditedText::from_diff(
|
||||
parent,
|
||||
diff.into_iter()
|
||||
.map(std::convert::TryInto::try_into)
|
||||
.collect::<Result<_, _>>()
|
||||
.expect("Invalid diff format"),
|
||||
&*tokenizer,
|
||||
)
|
||||
.apply()
|
||||
.text()
|
||||
) {
|
||||
Ok(edited_text) => edited_text.apply().text(),
|
||||
Err(e) => panic!("{}", e),
|
||||
}
|
||||
}
|
||||
|
||||
fn set_panic_hook() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue