9f62ad0 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Fixed last `unused` warning.

9f62ad0Nathan Vegdahl5 years ago

helix-core/src/syntax.rs+1−8

compare with master

unifiedsplit

@@ -567,7 +567,6 @@ impl LanguageLayer {

567 ) -> Vec<tree_sitter::InputEdit> {

568 use Operation::*;

569 let mut old_pos = 0;

570− let mut new_pos = 0;

571

570

572 let mut edits = Vec::new();

571 let mut edits = Vec::new();

573

572

@@ -611,9 +610,7 @@ impl LanguageLayer {

611 let mut old_end = old_pos + len;

610 let mut old_end = old_pos + len;

612

611

613 match change {

612 match change {

614− Retain(_) => {

613+ Retain(_) => {}

615− new_pos += len;

616− }

617 Delete(_) => {

614 Delete(_) => {

618 let (start_byte, start_position) = point_at_pos(old_text, old_pos);

615 let (start_byte, start_position) = point_at_pos(old_text, old_pos);

619 let (old_end_byte, old_end_position) = point_at_pos(old_text, old_end);

616 let (old_end_byte, old_end_position) = point_at_pos(old_text, old_end);

@@ -637,8 +634,6 @@ impl LanguageLayer {

637 Insert(s) => {

634 Insert(s) => {

638 let (start_byte, start_position) = point_at_pos(old_text, old_pos);

635 let (start_byte, start_position) = point_at_pos(old_text, old_pos);

639

636

640− let ins = s.chars().count();

641−

642 // a subsequent delete means a replace, consume it

637 // a subsequent delete means a replace, consume it

643 if let Some(Delete(len)) = iter.peek() {

638 if let Some(Delete(len)) = iter.peek() {

644 old_end = old_pos + len;

639 old_end = old_pos + len;

@@ -666,8 +661,6 @@ impl LanguageLayer {

666 new_end_position: traverse(start_position, s), // old pos + chars, newlines matter too (iter over)

661 new_end_position: traverse(start_position, s), // old pos + chars, newlines matter too (iter over)

667 });

662 });

668 }

663 }

669−

670− new_pos += ins;

671 }

664 }

672 }

665 }

673 old_pos = old_end;

666 old_pos = old_end;