From 44c3cedc48e5f3245429e694eee7aa9af9db0a78 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 10 Nov 2022 18:53:37 -0500 Subject: [PATCH] Skip additional completions on any kind of overlap with primary edit --- crates/project/src/project.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 0675610dcb..0e2723201a 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -3476,12 +3476,12 @@ impl Project { for (range, text) in edits { let primary = &completion.old_range; - let within_primary = primary.start.cmp(&range.start, buffer).is_ge() - && primary.end.cmp(&range.end, buffer).is_le(); - let within_additional = range.start.cmp(&primary.start, buffer).is_ge() - && range.end.cmp(&primary.end, buffer).is_le(); + let start_within = primary.start.cmp(&range.start, buffer).is_le() + && primary.end.cmp(&range.start, buffer).is_ge(); + let end_within = range.start.cmp(&primary.end, buffer).is_le() + && range.end.cmp(&primary.end, buffer).is_ge(); - if !within_primary && !within_additional { + if !start_within && !end_within { buffer.edit([(range, text)], None, cx); } }