mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 18:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix confirming completions in a multibuffer

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2022-02-08 15:05:34 -08:00
parent 93bcde953c
commit 624dbc1d0e
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/editor/src/editor.rs
View file

@ -1965,6 +1965,8 @@ impl Editor {
ConfirmCompletion(completion_ix): &ConfirmCompletion, ConfirmCompletion(completion_ix): &ConfirmCompletion,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> Option<Task<Result<()>>> { ) -> Option<Task<Result<()>>> {
use language::ToOffset as _;
let completions_menu = if let ContextMenu::Completions(menu) = self.hide_context_menu(cx)? { let completions_menu = if let ContextMenu::Completions(menu) = self.hide_context_menu(cx)? {
menu menu
} else { } else {
@ -1991,18 +1993,29 @@ impl Editor {
let old_text = buffer.text_for_range(old_range.clone()).collect::<String>(); let old_text = buffer.text_for_range(old_range.clone()).collect::<String>();
let selections = self.local_selections::<usize>(cx); let selections = self.local_selections::<usize>(cx);
let newest_selection = selections.iter().max_by_key(|s| s.id)?; let newest_selection = self.newest_anchor_selection()?;
let lookbehind = newest_selection.start.saturating_sub(old_range.start); if newest_selection.start.buffer_id != buffer_handle.id() {
let lookahead = old_range.end.saturating_sub(newest_selection.end); return None;
}
let lookbehind = newest_selection
.start
.text_anchor
.to_offset(buffer)
.saturating_sub(old_range.start);
let lookahead = old_range
.end
.saturating_sub(newest_selection.end.text_anchor.to_offset(buffer));
let mut common_prefix_len = old_text let mut common_prefix_len = old_text
.bytes() .bytes()
.zip(text.bytes()) .zip(text.bytes())
.take_while(|(a, b)| a == b) .take_while(|(a, b)| a == b)
.count(); .count();
let snapshot = self.buffer.read(cx).snapshot(cx);
let mut ranges = Vec::new(); let mut ranges = Vec::new();
for selection in &selections { for selection in &selections {
if buffer.contains_str_at(selection.start.saturating_sub(lookbehind), &old_text) { if snapshot.contains_str_at(selection.start.saturating_sub(lookbehind), &old_text) {
let start = selection.start.saturating_sub(lookbehind); let start = selection.start.saturating_sub(lookbehind);
let end = selection.end + lookahead; let end = selection.end + lookahead;
ranges.push(start + common_prefix_len..end); ranges.push(start + common_prefix_len..end);