From 74210fa2fd90c5b7cae91f7ea6f4e1f64a597198 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sat, 25 Jul 2020 23:25:36 +0200 Subject: Suggestion.apply_to(): Fix single-line patches Single-line changes weren't getting applied, because if only a single line changed, the `original_start_line` field is null. That caused the first `if` branch to always evaluate to true. Swap the `if` branches to fix this. --- src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 682464f..7108395 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -147,12 +147,12 @@ impl Suggestion { for (i, line) in reader.lines().enumerate() { match line { Ok(l) => { - if self.original_start_line.is_none() + if i == self.original_end_line { + write!(writer, "{}", self.suggestion()).unwrap(); + } else if self.original_start_line.is_none() || i < self.original_start_line.unwrap() || i > self.original_end_line { writeln!(writer, "{}", l).unwrap(); - } else if i == self.original_end_line { - write!(writer, "{}", self.suggestion()).unwrap(); } }, Err(e) => panic!(e), -- cgit v1.2.3