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

multi_buffer: Remove redundant buffer id field (#43459)

Browse Source 
It is easy for us to get the two fields out of sync causing weird
problems, there is no reason to have both here so.

Release Notes:

- N/A *or* Added/Fixed/Improved ...

Co-authored by: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Lukas Wirth
2025-11-25 17:13:16 +01:00
committed by GitHub
parent ab80ef1845
commit fafe1afa61
39 changed files with 378 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/assistant_text_thread/src/text_thread.rs
+7 -8
View File
@@ -797,7 +797,7 @@ impl TextThread {
});
let message = MessageAnchor {
id: first_message_id,
start: language::Anchor::MIN,
start: language::Anchor::min_for_buffer(this.buffer.read(cx).remote_id()),
};
this.messages_metadata.insert(
first_message_id,
@@ -1147,12 +1147,10 @@ impl TextThread {
cx: &App,
) -> bool {
let version = &self.buffer.read(cx).version;
let observed_start = range.start == language::Anchor::MIN
|| range.start == language::Anchor::MAX
|| version.observed(range.start.timestamp);
let observed_end = range.end == language::Anchor::MIN
|| range.end == language::Anchor::MAX
|| version.observed(range.end.timestamp);
let observed_start =
range.start.is_min() || range.start.is_max() || version.observed(range.start.timestamp);
let observed_end =
range.end.is_min() || range.end.is_max() || version.observed(range.end.timestamp);
observed_start && observed_end
}
@@ -2858,7 +2856,8 @@ impl TextThread {
messages.next();
}
}
let message_end_anchor = message_end.unwrap_or(language::Anchor::MAX);
let message_end_anchor =
message_end.unwrap_or(language::Anchor::max_for_buffer(buffer.remote_id()));
let message_end = message_end_anchor.to_offset(buffer);
return Some(Message {