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

editor: Add access method for project (#36266)

Browse source 
This resolves a `TODO` that I've stumbled upon too many times whilst
looking at the editor code.

Release Notes:

- N/A
This commit is contained in:
Finn Evers 2025-08-15 20:34:22 +02:00 • committed by GitHub
parent bd1fda6782
commit 3c5d5a1d57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 42 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/git_ui/src/conflict_view.rs
View file

@ -112,7 +112,7 @@ fn excerpt_for_buffer_updated(
}
fn buffer_added(editor: &mut Editor, buffer: Entity<Buffer>, cx: &mut Context<Editor>) {
let Some(project) = &editor.project else {
let Some(project) = editor.project() else {
return;
};
let git_store = project.read(cx).git_store().clone();
@ -469,7 +469,7 @@ pub(crate) fn resolve_conflict(
let Some((workspace, project, multibuffer, buffer)) = editor
.update(cx, |editor, cx| {
let workspace = editor.workspace()?;
let project = editor.project.clone()?;
let project = editor.project()?.clone();
let multibuffer = editor.buffer().clone();
let buffer_id = resolved_conflict.ours.end.buffer_id?;
let buffer = multibuffer.read(cx).buffer(buffer_id)?;