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

Show kernel options in a picker (#20274)

Browse source 
Closes #18341

* [x] Remove "Change Kernel" Doc link from REPL menu
* [x] Remove chevron
* [x] Set a higher min width
* [x] Include the language along with the kernel name

Future PRs will address

* Add support for Python envs (#18291, #16757, #15563)
* Add support for Remote kernels
* Project settings support (#16898)

Release Notes:

- Added kernel picker for repl

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
This commit is contained in:
Kyle Kelley 2024-11-07 17:59:53 -08:00 • committed by GitHub
parent f6d4a73c34
commit 36fe364c05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 492 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/repl/src/repl_store.rs
View file

@ -10,7 +10,7 @@ use gpui::{
use project::Fs;
use settings::{Settings, SettingsStore};
use crate::kernels::kernel_specifications;
use crate::kernels::local_kernel_specifications;
use crate::{JupyterSettings, KernelSpecification, Session};
struct GlobalReplStore(Model<ReplStore>);
@ -106,12 +106,17 @@ impl ReplStore {
}
pub fn refresh_kernelspecs(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
let kernel_specifications = kernel_specifications(self.fs.clone());
let local_kernel_specifications = local_kernel_specifications(self.fs.clone());
cx.spawn(|this, mut cx| async move {
let kernel_specifications = kernel_specifications.await?;
let local_kernel_specifications = local_kernel_specifications.await?;
let mut kernel_options = Vec::new();
for kernel_specification in local_kernel_specifications {
kernel_options.push(KernelSpecification::Jupyter(kernel_specification));
}
this.update(&mut cx, |this, cx| {
this.kernel_specifications = kernel_specifications;
this.kernel_specifications = kernel_options;
cx.notify();
})
})
@ -125,7 +130,9 @@ impl ReplStore {
.kernel_specifications
.iter()
.find(|runtime_specification| {
if let Some(selected) = selected_kernel {
if let (Some(selected), KernelSpecification::Jupyter(runtime_specification)) =
(selected_kernel, runtime_specification)
{
// Top priority is the selected kernel
return runtime_specification.name.to_lowercase() == selected.to_lowercase();
}
@ -139,9 +146,13 @@ impl ReplStore {
self.kernel_specifications
.iter()
.find(|runtime_specification| {
runtime_specification.kernelspec.language.to_lowercase()
== language_name.to_lowercase()
.find(|kernel_option| match kernel_option {
KernelSpecification::Jupyter(runtime_specification) => {
runtime_specification.kernelspec.language.to_lowercase()
== language_name.to_lowercase()
}
// todo!()
_ => false,
})
.cloned()
}