@@ -6697,7 +6697,6 @@ impl Editor {
return;
}
- let buffer_id = cursor_position.buffer_id;
let buffer = this.buffer.read(cx);
if buffer
.text_anchor_for_position(cursor_position, cx)
@@ -6710,8 +6709,8 @@ impl Editor {
let mut write_ranges = Vec::new();
let mut read_ranges = Vec::new();
for highlight in highlights {
- for (excerpt_id, excerpt_range) in
- buffer.excerpts_for_buffer(cursor_buffer.read(cx).remote_id(), cx)
+ let buffer_id = cursor_buffer.read(cx).remote_id();
+ for (excerpt_id, excerpt_range) in buffer.excerpts_for_buffer(buffer_id, cx)
{
let start = highlight
.range
@@ -6726,12 +6725,12 @@ impl Editor {
}
let range = Anchor {
- buffer_id,
+ buffer_id: Some(buffer_id),
excerpt_id,
text_anchor: start,
diff_base_anchor: None,
}..Anchor {
- buffer_id,
+ buffer_id: Some(buffer_id),
excerpt_id,
text_anchor: end,
diff_base_anchor: None,
@@ -9496,17 +9495,21 @@ impl Editor {
selection: Range<Anchor>,
cx: &mut Context<Self>,
) {
- let buffer_id = match (&selection.start.buffer_id, &selection.end.buffer_id) {
- (Some(a), Some(b)) if a == b => a,
- _ => {
- log::error!("expected anchor range to have matching buffer IDs");
- return;
- }
+ let Some((_, buffer, _)) = self
+ .buffer()
+ .read(cx)
+ .excerpt_containing(selection.start, cx)
+ else {
+ return;
};
- let multi_buffer = self.buffer().read(cx);
- let Some(buffer) = multi_buffer.buffer(*buffer_id) else {
+ let Some((_, end_buffer, _)) = self.buffer().read(cx).excerpt_containing(selection.end, cx)
+ else {
return;
};
+ if buffer != end_buffer {
+ log::error!("expected anchor range to have matching buffer IDs");
+ return;
+ }
let id = post_inc(&mut self.next_completion_id);
let snippet_sort_order = EditorSettings::get_global(cx).snippet_sort_order;
@@ -10593,16 +10596,12 @@ impl Editor {
snapshot: &EditorSnapshot,
cx: &mut Context<Self>,
) -> Option<(Anchor, Breakpoint)> {
- let project = self.project.clone()?;
-
- let buffer_id = breakpoint_position.buffer_id.or_else(|| {
- snapshot
- .buffer_snapshot
- .buffer_id_for_excerpt(breakpoint_position.excerpt_id)
- })?;
+ let buffer = self
+ .buffer
+ .read(cx)
+ .buffer_for_anchor(breakpoint_position, cx)?;
let enclosing_excerpt = breakpoint_position.excerpt_id;
- let buffer = project.read(cx).buffer_for_id(buffer_id, cx)?;
let buffer_snapshot = buffer.read(cx).snapshot();
let row = buffer_snapshot
@@ -10775,21 +10774,11 @@ impl Editor {
return;
};
- let Some(buffer_id) = breakpoint_position.buffer_id.or_else(|| {
- if breakpoint_position == Anchor::min() {
- self.buffer()
- .read(cx)
- .excerpt_buffer_ids()
- .into_iter()
- .next()
- } else {
- None
- }
- }) else {
- return;
- };
-
- let Some(buffer) = self.buffer().read(cx).buffer(buffer_id) else {
+ let Some(buffer) = self
+ .buffer
+ .read(cx)
+ .buffer_for_anchor(breakpoint_position, cx)
+ else {
return;
};
@@ -15432,7 +15421,8 @@ impl Editor {
return;
};
- let Some(buffer_id) = buffer.anchor_after(next_diagnostic.range.start).buffer_id else {
+ let next_diagnostic_start = buffer.anchor_after(next_diagnostic.range.start);
+ let Some(buffer_id) = buffer.buffer_id_for_anchor(next_diagnostic_start) else {
return;
};
self.change_selections(Default::default(), window, cx, |s| {
@@ -20425,11 +20415,8 @@ impl Editor {
.range_to_buffer_ranges_with_deleted_hunks(selection.range())
{
if let Some(anchor) = anchor {
- // selection is in a deleted hunk
- let Some(buffer_id) = anchor.buffer_id else {
- continue;
- };
- let Some(buffer_handle) = multi_buffer.buffer(buffer_id) else {
+ let Some(buffer_handle) = multi_buffer.buffer_for_anchor(anchor, cx)
+ else {
continue;
};
let offset = text::ToOffset::to_offset(
@@ -321,7 +321,10 @@ pub fn update_inlay_link_and_hover_points(
if let Some(cached_hint) = inlay_hint_cache.hint_by_id(excerpt_id, hovered_hint.id) {
match cached_hint.resolve_state {
ResolveState::CanResolve(_, _) => {
- if let Some(buffer_id) = previous_valid_anchor.buffer_id {
+ if let Some(buffer_id) = snapshot
+ .buffer_snapshot
+ .buffer_id_for_anchor(previous_valid_anchor)
+ {
inlay_hint_cache.spawn_hint_resolve(
buffer_id,
excerpt_id,
@@ -475,10 +475,7 @@ impl InlayHintCache {
let excerpt_cached_hints = excerpt_cached_hints.read();
let mut excerpt_cache = excerpt_cached_hints.ordered_hints.iter().fuse().peekable();
shown_excerpt_hints_to_remove.retain(|(shown_anchor, shown_hint_id)| {
- let Some(buffer) = shown_anchor
- .buffer_id
- .and_then(|buffer_id| multi_buffer.buffer(buffer_id))
- else {
+ let Some(buffer) = multi_buffer.buffer_for_anchor(*shown_anchor, cx) else {
return false;
};
let buffer_snapshot = buffer.read(cx).snapshot();
@@ -72,7 +72,7 @@ pub(super) fn refresh_linked_ranges(
// Throw away selections spanning multiple buffers.
continue;
}
- if let Some(buffer) = end_position.buffer_id.and_then(|id| buffer.buffer(id)) {
+ if let Some(buffer) = buffer.buffer_for_anchor(end_position, cx) {
applicable_selections.push((
buffer,
start_position.text_anchor,
@@ -190,14 +190,16 @@ pub fn deploy_context_menu(
.all::<PointUtf16>(cx)
.into_iter()
.any(|s| !s.is_empty());
- let has_git_repo = anchor.buffer_id.is_some_and(|buffer_id| {
- project
- .read(cx)
- .git_store()
- .read(cx)
- .repository_and_path_for_buffer_id(buffer_id, cx)
- .is_some()
- });
+ let has_git_repo = buffer
+ .buffer_id_for_anchor(anchor)
+ .is_some_and(|buffer_id| {
+ project
+ .read(cx)
+ .git_store()
+ .read(cx)
+ .repository_and_path_for_buffer_id(buffer_id, cx)
+ .is_some()
+ });
let evaluate_selection = window.is_action_available(&EvaluateSelectedText, cx);
let run_to_cursor = window.is_action_available(&RunToCursor, cx);
@@ -4393,12 +4393,13 @@ impl OutlinePanel {
})
.filter(|(match_range, _)| {
let editor = active_editor.read(cx);
- if let Some(buffer_id) = match_range.start.buffer_id
+ let snapshot = editor.buffer().read(cx).snapshot(cx);
+ if let Some(buffer_id) = snapshot.buffer_id_for_anchor(match_range.start)
&& editor.is_buffer_folded(buffer_id, cx)
{
return false;
}
- if let Some(buffer_id) = match_range.start.buffer_id
+ if let Some(buffer_id) = snapshot.buffer_id_for_anchor(match_range.end)
&& editor.is_buffer_folded(buffer_id, cx)
{
return false;