Skip to content

Commit 6b47427

Browse files
committed
all tests are green
1 parent 62cb6eb commit 6b47427

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

src/index/diff/delegate.rs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,21 @@ impl Delegate {
107107
}
108108
}
109109
(true, true) => {
110-
// These should always be yanked, but we check it anyway.
111-
for inserted in lines_after {
112-
match version_from_json_line(inserted, location) {
113-
Ok(version) => {
114-
self.changes.push(if version.yanked {
115-
Change::Yanked(version)
116-
} else {
117-
Change::Added(version)
118-
});
110+
for (removed, inserted) in lines_before.zip(lines_after) {
111+
match version_from_json_line(inserted, location).and_then(
112+
|inserted| {
113+
version_from_json_line(removed, location)
114+
.map(|removed| (removed, inserted))
115+
},
116+
) {
117+
Ok((removed, inserted)) => {
118+
if removed.yanked != inserted.yanked {
119+
self.changes.push(if inserted.yanked {
120+
Change::Yanked(inserted)
121+
} else {
122+
Change::Added(inserted)
123+
});
124+
}
119125
}
120126
Err(e) => {
121127
err = Some(e);

0 commit comments

Comments
 (0)