-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tasks: Add status indicator to the status bar (#10267)
Release Notes: - Added task status indicator to the status bar.
- Loading branch information
Showing
7 changed files
with
153 additions
and
6 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
use schemars::JsonSchema; | ||
use serde::{Deserialize, Serialize}; | ||
|
||
#[derive(Serialize, Deserialize, PartialEq, Default)] | ||
pub(crate) struct TaskSettings { | ||
pub(crate) show_status_indicator: bool, | ||
} | ||
|
||
/// Task-related settings. | ||
#[derive(Serialize, Deserialize, PartialEq, Default, Clone, JsonSchema)] | ||
pub(crate) struct TaskSettingsContent { | ||
/// Whether to show task status indicator in the status bar. Default: true | ||
show_status_indicator: Option<bool>, | ||
} | ||
|
||
impl settings::Settings for TaskSettings { | ||
const KEY: Option<&'static str> = Some("task"); | ||
|
||
type FileContent = TaskSettingsContent; | ||
|
||
fn load( | ||
default_value: &Self::FileContent, | ||
user_values: &[&Self::FileContent], | ||
_: &mut gpui::AppContext, | ||
) -> gpui::Result<Self> | ||
where | ||
Self: Sized, | ||
{ | ||
let this = Self::json_merge(default_value, user_values)?; | ||
Ok(Self { | ||
show_status_indicator: this.show_status_indicator.unwrap_or(true), | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
use gpui::{IntoElement, Render, View, WeakView}; | ||
use settings::Settings; | ||
use ui::{ | ||
div, ButtonCommon, Clickable, Color, FluentBuilder, IconButton, IconName, Tooltip, | ||
VisualContext, WindowContext, | ||
}; | ||
use workspace::{item::ItemHandle, StatusItemView, Workspace}; | ||
|
||
use crate::{modal::Spawn, settings::TaskSettings}; | ||
|
||
enum TaskStatus { | ||
Failed, | ||
Running, | ||
Succeeded, | ||
} | ||
|
||
/// A status bar icon that surfaces the status of running tasks. | ||
/// It has a different color depending on the state of running tasks: | ||
/// - red if any open task tab failed | ||
/// - else, yellow if any open task tab is still running | ||
/// - else, green if there tasks tabs open, and they have all succeeded | ||
/// - else, no indicator if there are no open task tabs | ||
pub struct TaskStatusIndicator { | ||
workspace: WeakView<Workspace>, | ||
} | ||
|
||
impl TaskStatusIndicator { | ||
pub fn new(workspace: WeakView<Workspace>, cx: &mut WindowContext) -> View<Self> { | ||
cx.new_view(|_| Self { workspace }) | ||
} | ||
fn current_status(&self, cx: &mut WindowContext) -> Option<TaskStatus> { | ||
self.workspace | ||
.update(cx, |this, cx| { | ||
let mut status = None; | ||
let project = this.project().read(cx); | ||
|
||
for handle in project.local_terminal_handles() { | ||
let Some(handle) = handle.upgrade() else { | ||
continue; | ||
}; | ||
let handle = handle.read(cx); | ||
let task_state = handle.task(); | ||
if let Some(state) = task_state { | ||
match state.status { | ||
terminal::TaskStatus::Running => { | ||
let _ = status.insert(TaskStatus::Running); | ||
} | ||
terminal::TaskStatus::Completed { success } => { | ||
if !success { | ||
let _ = status.insert(TaskStatus::Failed); | ||
return status; | ||
} | ||
status.get_or_insert(TaskStatus::Succeeded); | ||
} | ||
_ => {} | ||
}; | ||
} | ||
} | ||
status | ||
}) | ||
.ok() | ||
.flatten() | ||
} | ||
} | ||
|
||
impl Render for TaskStatusIndicator { | ||
fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement { | ||
if !TaskSettings::get_global(cx).show_status_indicator { | ||
return div().into_any_element(); | ||
} | ||
let current_status = self.current_status(cx); | ||
let color = current_status.map(|status| match status { | ||
TaskStatus::Failed => Color::Error, | ||
TaskStatus::Running => Color::Warning, | ||
TaskStatus::Succeeded => Color::Success, | ||
}); | ||
IconButton::new("tasks-activity-indicator", IconName::Play) | ||
.when_some(color, |this, color| this.icon_color(color)) | ||
.on_click(cx.listener(|this, _, cx| { | ||
this.workspace | ||
.update(cx, |this, cx| { | ||
crate::spawn_task_or_modal(this, &Spawn::modal(), cx) | ||
}) | ||
.ok(); | ||
})) | ||
.tooltip(|cx| Tooltip::for_action("Spawn tasks", &Spawn { task_name: None }, cx)) | ||
.into_any_element() | ||
} | ||
} | ||
|
||
impl StatusItemView for TaskStatusIndicator { | ||
fn set_active_pane_item( | ||
&mut self, | ||
_: Option<&dyn ItemHandle>, | ||
_: &mut ui::prelude::ViewContext<Self>, | ||
) { | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters