Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove special case for singleton buffers from MultiBufferSnapshot::anchor_at (#36524)

Browse source 
This may be responsible for a panic that we've been seeing with
increased frequency in agent2 threads.

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
Cole Miller 2025-08-20 14:43:29 -04:00 • committed by GitHub
parent ec8106d1db
commit b6722ca3c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4876,11 +4876,7 @@ impl Editor {
cx: &mut Context<Self>,
) -> bool {
let position = self.selections.newest_anchor().head();
let multibuffer = self.buffer.read(cx);
let Some(buffer) = position
.buffer_id
.and_then(|buffer_id| multibuffer.buffer(buffer_id))
else {
let Some(buffer) = self.buffer.read(cx).buffer_for_anchor(position, cx) else {
return false;
};
@ -5844,7 +5840,7 @@ impl Editor {
multibuffer_anchor.start.to_offset(&snapshot)
..multibuffer_anchor.end.to_offset(&snapshot)
};
if newest_anchor.head().buffer_id != Some(buffer.remote_id()) {
if snapshot.buffer_id_for_anchor(newest_anchor.head()) != Some(buffer.remote_id()) {
return None;
}