vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-05-24 05:25:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Resolve semantic merge conflict (#48999)

Browse source 
Caused by https://github.com/zed-industries/zed/pull/48763 and
https://github.com/zed-industries/zed/pull/48800

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Lukas Wirth 2026-02-12 08:53:30 +01:00 • committed by GitHub
parent c6cd08e37a
commit a6797892ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/repl/src/repl_editor.rs
View file

@ -8,10 +8,7 @@ use editor::{Editor, MultiBufferOffset};
use gpui::{App, Entity, WeakEntity, Window, prelude::*};
use language::{BufferSnapshot, Language, LanguageName, Point};
use project::{ProjectItem as _, WorktreeId};
use workspace::{
Workspace,
notifications::{NotificationId, NotificationSource},
};
use workspace::{Workspace, notifications::NotificationId};
use crate::kernels::PythonEnvKernelSpecification;
use crate::repl_store::ReplStore;
@ -102,7 +99,6 @@ pub fn install_ipykernel_and_assign(
notification_id.clone(),
format!("Installing ipykernel in {}...", env_name),
),
NotificationSource::Project,
cx,
);
});
@ -141,7 +137,6 @@ pub fn install_ipykernel_and_assign(
format!("ipykernel installed in {}", env_name),
)
.autohide(),
NotificationSource::Project,
cx,
);
})
@ -172,7 +167,6 @@ pub fn install_ipykernel_and_assign(
env_name, error
),
),
NotificationSource::Project,
cx,
);
})