andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

fix: Remove empty scratch buffer from jumplists when removing it

Browse Source 
Fixes #1238
This commit is contained in:
Blaž Hrastnik 2022-05-30 01:21:41 +09:00
parent 710c4a84b2
commit 5ed6223990
No known key found for this signature in database
GPG Key ID: 1238B9C4AD889640
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helix-view/src/editor.rs
View File

@ -671,11 +671,18 @@ pub fn switch(&mut self, id: DocumentId, action: Action) {
.any(|(_, v)| v.doc == doc.id && v.id != view.id);
let (view, doc) = current!(self);
let view_id = view.id;
if remove_empty_scratch {
// Copy `doc.id` into a variable before calling `self.documents.remove`, which requires a mutable
// borrow, invalidating direct access to `doc.id`.
let id = doc.id;
self.documents.remove(&id);
// Remove the scratch buffer from any jumplists
for (view, _) in self.tree.views_mut() {
view.jumps.remove(&id)
}
} else {
let jump = (view.doc, doc.selection(view.id).clone());
view.jumps.push(jump);
@ -691,7 +698,6 @@ pub fn switch(&mut self, id: DocumentId, action: Action) {
}
}
let view_id = view.id;
self.replace_document_in_view(view_id, id);
return;