oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multi_buffer: Typed MultiBufferOffset (#42707)

Browse Source 
This PR introduces a new `MultiBufferOffset` new type wrapping size. The
goal of this is to make it clear at the type level when we are
interacting with offsets of a multi buffer versus offsets of a language
/ text buffer. This improves readability of things quite a bit by making
it clear what kind of offsets one is working with while also reducing
accidental bugs by using the wrong kin of offset for the wrong API.

This PR also uncovered two minor bugs due to that.

Does not yet introduce the MultiBufferPoint equivalent, that is for a
follow up PR.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Lukas Wirth
2025-11-19 22:00:58 +00:00
committed by GitHub
parent 5e21457f21
commit c98b2d6944
81 changed files with 2957 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/multi_buffer/src/transaction.rs
+24 -10
View File
@@ -1,14 +1,14 @@
use gpui::{App, Context, Entity};
use language::{self, Buffer, TextDimension, TransactionId};
use language::{self, Buffer, TransactionId};
use std::{
collections::HashMap,
ops::{Range, Sub},
ops::{AddAssign, Range, Sub},
time::{Duration, Instant},
};
use sum_tree::Bias;
use text::BufferId;
use crate::BufferState;
use crate::{BufferState, MultiBufferDimension};
use super::{Event, ExcerptSummary, MultiBuffer};
@@ -320,7 +320,11 @@ impl MultiBuffer {
cx: &App,
) -> Vec<Range<D>>
where
D: TextDimension + Ord + Sub<D, Output = D>,
D: MultiBufferDimension
+ Ord
+ Sub<D, Output = D::TextDimension>
+ AddAssign<D::TextDimension>,
D::TextDimension: PartialOrd + Sub<D::TextDimension, Output = D::TextDimension>,
{
let Some(transaction) = self.history.transaction(transaction_id) else {
return Vec::new();
@@ -336,24 +340,34 @@ impl MultiBuffer {
};
let buffer = buffer_state.buffer.read(cx);
for range in buffer.edited_ranges_for_transaction_id::<D>(*buffer_transaction) {
for range in
buffer.edited_ranges_for_transaction_id::<D::TextDimension>(*buffer_transaction)
{
for excerpt_id in &buffer_state.excerpts {
cursor.seek(excerpt_id, Bias::Left);
if let Some(excerpt) = cursor.item()
&& excerpt.locator == *excerpt_id
{
let excerpt_buffer_start = excerpt.range.context.start.summary::<D>(buffer);
let excerpt_buffer_end = excerpt.range.context.end.summary::<D>(buffer);
let excerpt_buffer_start = excerpt
.range
.context
.start
.summary::<D::TextDimension>(buffer);
let excerpt_buffer_end = excerpt
.range
.context
.end
.summary::<D::TextDimension>(buffer);
let excerpt_range = excerpt_buffer_start..excerpt_buffer_end;
if excerpt_range.contains(&range.start)
&& excerpt_range.contains(&range.end)
{
let excerpt_start = D::from_text_summary(&cursor.start().text);
let excerpt_start = D::from_summary(&cursor.start().text);
let mut start = excerpt_start;
start.add_assign(&(range.start - excerpt_buffer_start));
start += range.start - excerpt_buffer_start;
let mut end = excerpt_start;
end.add_assign(&(range.end - excerpt_buffer_start));
end += range.end - excerpt_buffer_start;
ranges.push(start..end);
break;