diff --git a/Cargo.lock b/Cargo.lock index 9e247753ef..6b79315217 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13797,10 +13797,8 @@ dependencies = [ "menu", "picker", "project", - "schemars", "serde", "serde_json", - "settings", "task", "tree-sitter-rust", "tree-sitter-typescript", diff --git a/assets/settings/default.json b/assets/settings/default.json index bd540ab9a1..852fe1fdbc 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1475,11 +1475,6 @@ "dev": { // "theme": "Andromeda" }, - // Task-related settings. - "task": { - // Whether to show task status indicator in the status bar. Default: true - "show_status_indicator": true - }, // Whether to show full labels in line indicator or short ones // // Values: diff --git a/crates/tasks_ui/Cargo.toml b/crates/tasks_ui/Cargo.toml index 6970492cbc..edb3b2a8fb 100644 --- a/crates/tasks_ui/Cargo.toml +++ b/crates/tasks_ui/Cargo.toml @@ -23,9 +23,7 @@ menu.workspace = true picker.workspace = true project.workspace = true task.workspace = true -schemars.workspace = true serde.workspace = true -settings.workspace = true ui.workspace = true util.workspace = true workspace.workspace = true diff --git a/crates/tasks_ui/src/settings.rs b/crates/tasks_ui/src/settings.rs deleted file mode 100644 index 6038f18100..0000000000 --- a/crates/tasks_ui/src/settings.rs +++ /dev/null @@ -1,25 +0,0 @@ -use schemars::JsonSchema; -use serde::{Deserialize, Serialize}; -use settings::{Settings, SettingsSources}; - -#[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, -} - -impl Settings for TaskSettings { - const KEY: Option<&'static str> = Some("task"); - - type FileContent = TaskSettingsContent; - - fn load(sources: SettingsSources, _: &mut gpui::App) -> gpui::Result { - sources.json_merge() - } -} diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rs index b99884dc75..f18afa1b87 100644 --- a/crates/tasks_ui/src/tasks_ui.rs +++ b/crates/tasks_ui/src/tasks_ui.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use std::path::Path; -use ::settings::Settings; use editor::Editor; use feature_flags::{Debugger, FeatureFlagViewExt}; use gpui::{App, AppContext as _, Context, Entity, Task, Window}; @@ -12,12 +11,10 @@ use workspace::tasks::schedule_task; use workspace::{tasks::schedule_resolved_task, Start, Workspace}; mod modal; -mod settings; pub use modal::{Rerun, Spawn}; pub fn init(cx: &mut App) { - settings::TaskSettings::register(cx); cx.observe_new( |workspace: &mut Workspace, window: Option<&mut Window>, cx: &mut Context| { workspace