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

First pass on fixes

Browse source
This commit is contained in:
Piotr Osiewicz 2025-08-19 14:23:59 +02:00
parent 5826d89b97
commit 2f3be75fc7
269 changed files with 1593 additions and 2574 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/toolchain_selector/src/active_toolchain.rs
View file

@ -121,8 +121,8 @@ impl ActiveToolchain {
cx: &mut Context<Self>,
) {
let editor = editor.read(cx);
if let Some((_, buffer, _)) = editor.active_excerpt(cx) {
if let Some(worktree_id) = buffer.read(cx).file().map(|file| file.worktree_id(cx)) {
if let Some((_, buffer, _)) = editor.active_excerpt(cx)
&& let Some(worktree_id) = buffer.read(cx).file().map(|file| file.worktree_id(cx)) {
if self
.active_buffer
.as_ref()
@ -146,7 +146,6 @@ impl ActiveToolchain {
self.active_buffer = Some((worktree_id, buffer.downgrade(), subscription));
self._update_toolchain_task = Self::spawn_tracker_task(window, cx);
}
}
cx.notify();
}

5
crates/toolchain_selector/src/toolchain_selector.rs
View file

@ -211,8 +211,8 @@ impl ToolchainSelectorDelegate {
let _ = this.update_in(cx, move |this, window, cx| {
this.delegate.candidates = available_toolchains;
if let Some(active_toolchain) = active_toolchain {
if let Some(position) = this
if let Some(active_toolchain) = active_toolchain
&& let Some(position) = this
.delegate
.candidates
.toolchains
@ -221,7 +221,6 @@ impl ToolchainSelectorDelegate {
{
this.delegate.set_selected_index(position, window, cx);
}
}
this.update_matches(this.query(cx), window, cx);
});