51162ae · helix · git.iko.soy

163 head_a = a;

164 head_b = changes_b.next();

165 }

166− (None, _) | (_, None) => return unreachable!(),

166+ (None, val) | (val, None) => return unreachable!("({:?})", val),

167 (Some(Retain(i)), Some(Retain(j))) => match i.cmp(&j) {

168 Ordering::Less => {

169 changes.retain(i);

195 Ordering::Greater => {

196 // TODO: cover this with a test

197 // figure out the byte index of the truncated string end

198− let (pos, _) = s.char_indices().nth(len - j).unwrap();

198+ let (pos, _) = s.char_indices().nth(j).unwrap();

199 s.pop_front(pos as u32);

200 head_a = Some(Insert(s));

201 head_b = changes_b.next();

599 };

600

601 let b = ChangeSet {

602− changes: vec![Delete(10), Insert("world".into()), Retain(5)],

602+ changes: vec![Delete(10), Insert("世orld".into()), Retain(5)],

603 len: 15,

604 len_after: 10,

605 };

610 let composed = a.compose(b);

611 assert_eq!(composed.len, 8);

612 assert!(composed.apply(&mut text));

613− assert_eq!(text, "world! abc");

613+ assert_eq!(text, "世orld! abc");

614 }

615

616 #[test]