This is a follow-up PR to https://github.com/zed-industries/zed/pull/39609, and attempts to address hidden status bar items still contributing to the layout and creating extra spacing.  - 203cbd634bfb1489b8afa4952d9594615a956b77 Adds a `.none()` method to the `gpui::Styled` helper trait, so that status items can set their display type to none inside their `render` method. - 249f06e3de63b0ab32814f20e7105d8e2b642f02 Applies `.none()` to all the status items. - ~~499f564906c88336608c81615b11ebc9ab43d832~~ At first I was adding an `is_visible` method to the `StatusBarView` trait, which would be used to skip status bar items which would just render an empty div anyway, but I felt duplicating the conditions for hiding the buttons between the status items `is_visible` and `render` methods could be an attraction for bugs, so I tried to find another approach. This commit contains those changes, reverted immediately (if the `is_visible` approach is preferred I can bring it back!) - f37cb75f0519ceea1f3e1cc4f97087a5cb34b0fd (bonus!) Adds a condition to the vim mode indicator to avoid a leading space when there are no pending keys. Release Notes: - N/A
265 lines
9.7 KiB
Rust
265 lines
9.7 KiB
Rust
use std::sync::Arc;
|
|
|
|
use editor::Editor;
|
|
use gpui::{
|
|
AsyncWindowContext, Context, Entity, IntoElement, ParentElement, Render, Styled, Subscription,
|
|
Task, WeakEntity, Window, div,
|
|
};
|
|
use language::{Buffer, BufferEvent, LanguageName, Toolchain, ToolchainScope};
|
|
use project::{Project, ProjectPath, Toolchains, WorktreeId, toolchain_store::ToolchainStoreEvent};
|
|
use ui::{Button, ButtonCommon, Clickable, LabelSize, SharedString, Tooltip};
|
|
use util::{maybe, rel_path::RelPath};
|
|
use workspace::{StatusItemView, Workspace, item::ItemHandle};
|
|
|
|
use crate::ToolchainSelector;
|
|
|
|
pub struct ActiveToolchain {
|
|
active_toolchain: Option<Toolchain>,
|
|
term: SharedString,
|
|
workspace: WeakEntity<Workspace>,
|
|
active_buffer: Option<(WorktreeId, WeakEntity<Buffer>, Subscription)>,
|
|
_update_toolchain_task: Task<Option<()>>,
|
|
}
|
|
|
|
impl ActiveToolchain {
|
|
pub fn new(workspace: &Workspace, window: &mut Window, cx: &mut Context<Self>) -> Self {
|
|
if let Some(store) = workspace.project().read(cx).toolchain_store() {
|
|
cx.subscribe_in(
|
|
&store,
|
|
window,
|
|
|this, _, _: &ToolchainStoreEvent, window, cx| {
|
|
let editor = this
|
|
.workspace
|
|
.update(cx, |workspace, cx| {
|
|
workspace
|
|
.active_item(cx)
|
|
.and_then(|item| item.downcast::<Editor>())
|
|
})
|
|
.ok()
|
|
.flatten();
|
|
if let Some(editor) = editor {
|
|
this.update_lister(editor, window, cx);
|
|
}
|
|
},
|
|
)
|
|
.detach();
|
|
}
|
|
Self {
|
|
active_toolchain: None,
|
|
active_buffer: None,
|
|
term: SharedString::new_static("Toolchain"),
|
|
workspace: workspace.weak_handle(),
|
|
|
|
_update_toolchain_task: Self::spawn_tracker_task(window, cx),
|
|
}
|
|
}
|
|
fn spawn_tracker_task(window: &mut Window, cx: &mut Context<Self>) -> Task<Option<()>> {
|
|
cx.spawn_in(window, async move |this, cx| {
|
|
let did_set_toolchain = maybe!(async {
|
|
let active_file = this
|
|
.read_with(cx, |this, _| {
|
|
this.active_buffer
|
|
.as_ref()
|
|
.map(|(_, buffer, _)| buffer.clone())
|
|
})
|
|
.ok()
|
|
.flatten()?;
|
|
let workspace = this.read_with(cx, |this, _| this.workspace.clone()).ok()?;
|
|
let language_name = active_file
|
|
.read_with(cx, |this, _| Some(this.language()?.name()))
|
|
.ok()
|
|
.flatten()?;
|
|
let meta = workspace
|
|
.update(cx, |workspace, cx| {
|
|
let languages = workspace.project().read(cx).languages();
|
|
Project::toolchain_metadata(languages.clone(), language_name.clone())
|
|
})
|
|
.ok()?
|
|
.await?;
|
|
let _ = this.update(cx, |this, cx| {
|
|
this.term = meta.term;
|
|
cx.notify();
|
|
});
|
|
let (worktree_id, path) = active_file
|
|
.update(cx, |this, cx| {
|
|
this.file().and_then(|file| {
|
|
Some((file.worktree_id(cx), file.path().parent()?.into()))
|
|
})
|
|
})
|
|
.ok()
|
|
.flatten()?;
|
|
let toolchain =
|
|
Self::active_toolchain(workspace, worktree_id, path, language_name, cx).await?;
|
|
this.update(cx, |this, cx| {
|
|
this.active_toolchain = Some(toolchain);
|
|
|
|
cx.notify();
|
|
})
|
|
.ok()
|
|
})
|
|
.await
|
|
.is_some();
|
|
if !did_set_toolchain {
|
|
this.update(cx, |this, cx| {
|
|
this.active_toolchain = None;
|
|
cx.notify();
|
|
})
|
|
.ok();
|
|
}
|
|
did_set_toolchain.then_some(())
|
|
})
|
|
}
|
|
|
|
fn update_lister(
|
|
&mut self,
|
|
editor: Entity<Editor>,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let editor = editor.read(cx);
|
|
if let Some((_, buffer, _)) = editor.active_excerpt(cx)
|
|
&& let Some(worktree_id) = buffer.read(cx).file().map(|file| file.worktree_id(cx))
|
|
{
|
|
let subscription = cx.subscribe_in(
|
|
&buffer,
|
|
window,
|
|
|this, _, event: &BufferEvent, window, cx| {
|
|
if matches!(event, BufferEvent::LanguageChanged) {
|
|
this._update_toolchain_task = Self::spawn_tracker_task(window, cx);
|
|
}
|
|
},
|
|
);
|
|
self.active_buffer = Some((worktree_id, buffer.downgrade(), subscription));
|
|
self._update_toolchain_task = Self::spawn_tracker_task(window, cx);
|
|
}
|
|
|
|
cx.notify();
|
|
}
|
|
|
|
fn active_toolchain(
|
|
workspace: WeakEntity<Workspace>,
|
|
worktree_id: WorktreeId,
|
|
relative_path: Arc<RelPath>,
|
|
language_name: LanguageName,
|
|
cx: &mut AsyncWindowContext,
|
|
) -> Task<Option<Toolchain>> {
|
|
cx.spawn(async move |cx| {
|
|
let workspace_id = workspace
|
|
.read_with(cx, |this, _| this.database_id())
|
|
.ok()
|
|
.flatten()?;
|
|
let selected_toolchain = workspace
|
|
.update(cx, |this, cx| {
|
|
this.project().read(cx).active_toolchain(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: relative_path.clone(),
|
|
},
|
|
language_name.clone(),
|
|
cx,
|
|
)
|
|
})
|
|
.ok()?
|
|
.await;
|
|
if let Some(toolchain) = selected_toolchain {
|
|
Some(toolchain)
|
|
} else {
|
|
let project = workspace
|
|
.read_with(cx, |this, _| this.project().clone())
|
|
.ok()?;
|
|
let Toolchains {
|
|
toolchains,
|
|
root_path: relative_path,
|
|
user_toolchains,
|
|
} = cx
|
|
.update(|_, cx| {
|
|
project.read(cx).available_toolchains(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: relative_path.clone(),
|
|
},
|
|
language_name,
|
|
cx,
|
|
)
|
|
})
|
|
.ok()?
|
|
.await?;
|
|
// Since we don't have a selected toolchain, pick one for user here.
|
|
let default_choice = user_toolchains
|
|
.iter()
|
|
.find_map(|(scope, toolchains)| {
|
|
if scope == &ToolchainScope::Global {
|
|
// Ignore global toolchains when making a default choice. They're unlikely to be the right choice.
|
|
None
|
|
} else {
|
|
toolchains.first()
|
|
}
|
|
})
|
|
.or_else(|| toolchains.toolchains.first())
|
|
.cloned();
|
|
if let Some(toolchain) = &default_choice {
|
|
workspace::WORKSPACE_DB
|
|
.set_toolchain(
|
|
workspace_id,
|
|
worktree_id,
|
|
relative_path.clone(),
|
|
toolchain.clone(),
|
|
)
|
|
.await
|
|
.ok()?;
|
|
project
|
|
.update(cx, |this, cx| {
|
|
this.activate_toolchain(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: relative_path,
|
|
},
|
|
toolchain.clone(),
|
|
cx,
|
|
)
|
|
})
|
|
.ok()?
|
|
.await;
|
|
}
|
|
|
|
default_choice
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
impl Render for ActiveToolchain {
|
|
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let Some(active_toolchain) = self.active_toolchain.as_ref() else {
|
|
return div().hidden();
|
|
};
|
|
|
|
div().child(
|
|
Button::new("change-toolchain", active_toolchain.name.clone())
|
|
.label_size(LabelSize::Small)
|
|
.on_click(cx.listener(|this, _, window, cx| {
|
|
if let Some(workspace) = this.workspace.upgrade() {
|
|
workspace.update(cx, |workspace, cx| {
|
|
ToolchainSelector::toggle(workspace, window, cx)
|
|
});
|
|
}
|
|
}))
|
|
.tooltip(Tooltip::text(format!("Select {}", &self.term))),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl StatusItemView for ActiveToolchain {
|
|
fn set_active_pane_item(
|
|
&mut self,
|
|
active_pane_item: Option<&dyn ItemHandle>,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
if let Some(editor) = active_pane_item.and_then(|item| item.downcast::<Editor>()) {
|
|
self.update_lister(editor, window, cx);
|
|
}
|
|
cx.notify();
|
|
}
|
|
}
|