Detailed changes
@@ -1200,6 +1200,7 @@ dependencies = [
"client",
"collections",
"db",
+ "feature_flags",
"futures 0.3.28",
"gpui",
"image",
@@ -1215,7 +1216,6 @@ dependencies = [
"serde_derive",
"settings",
"smol",
- "staff_mode",
"sum_tree",
"tempfile",
"text",
@@ -1374,6 +1374,7 @@ dependencies = [
"async-tungstenite",
"collections",
"db",
+ "feature_flags",
"futures 0.3.28",
"gpui",
"image",
@@ -1388,7 +1389,6 @@ dependencies = [
"serde_derive",
"settings",
"smol",
- "staff_mode",
"sum_tree",
"tempfile",
"text",
@@ -1528,6 +1528,7 @@ dependencies = [
"context_menu",
"db",
"editor",
+ "feature_flags",
"feedback",
"futures 0.3.28",
"fuzzy",
@@ -1543,7 +1544,6 @@ dependencies = [
"serde",
"serde_derive",
"settings",
- "staff_mode",
"theme",
"theme_selector",
"util",
@@ -2529,6 +2529,14 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+[[package]]
+name = "feature_flags"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "gpui",
+]
+
[[package]]
name = "feedback"
version = "0.1.0"
@@ -6834,6 +6842,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"collections",
+ "feature_flags",
"fs",
"futures 0.3.28",
"gpui",
@@ -6849,7 +6858,6 @@ dependencies = [
"serde_json_lenient",
"smallvec",
"sqlez",
- "staff_mode",
"toml 0.5.11",
"tree-sitter",
"tree-sitter-json 0.19.0",
@@ -7284,14 +7292,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-[[package]]
-name = "staff_mode"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "gpui",
-]
-
[[package]]
name = "static_assertions"
version = "1.1.0"
@@ -7672,6 +7672,7 @@ name = "theme_selector"
version = "0.1.0"
dependencies = [
"editor",
+ "feature_flags",
"fs",
"fuzzy",
"gpui",
@@ -7681,7 +7682,6 @@ dependencies = [
"postage",
"settings",
"smol",
- "staff_mode",
"theme",
"util",
"workspace",
@@ -9726,6 +9726,7 @@ dependencies = [
"diagnostics",
"editor",
"env_logger 0.9.3",
+ "feature_flags",
"feedback",
"file_finder",
"fs",
@@ -9772,7 +9773,6 @@ dependencies = [
"simplelog",
"smallvec",
"smol",
- "staff_mode",
"sum_tree",
"tempdir",
"terminal_view",
@@ -62,7 +62,7 @@ members = [
"crates/snippet",
"crates/sqlez",
"crates/sqlez_macros",
- "crates/staff_mode",
+ "crates/feature_flags",
"crates/sum_tree",
"crates/terminal",
"crates/text",
@@ -21,7 +21,7 @@ rpc = { path = "../rpc" }
text = { path = "../text" }
language = { path = "../language" }
settings = { path = "../settings" }
-staff_mode = { path = "../staff_mode" }
+feature_flags = { path = "../feature_flags" }
sum_tree = { path = "../sum_tree" }
anyhow.workspace = true
@@ -19,7 +19,7 @@ util = { path = "../util" }
rpc = { path = "../rpc" }
text = { path = "../text" }
settings = { path = "../settings" }
-staff_mode = { path = "../staff_mode" }
+feature_flags = { path = "../feature_flags" }
sum_tree = { path = "../sum_tree" }
anyhow.workspace = true
@@ -135,8 +135,6 @@ impl Telemetry {
}
}
- /// This method takes the entire TelemetrySettings struct in order to force client code
- /// to pull the struct out of the settings global. Do not remove!
pub fn set_authenticated_user_info(
self: &Arc<Self>,
metrics_id: Option<String>,
@@ -168,6 +168,7 @@ impl FakeServer {
GetPrivateUserInfoResponse {
metrics_id: "the-metrics-id".into(),
staff: false,
+ flags: Default::default(),
},
)
.await;
@@ -1,11 +1,11 @@
use super::{proto, Client, Status, TypedEnvelope};
use anyhow::{anyhow, Context, Result};
use collections::{hash_map::Entry, HashMap, HashSet};
+use feature_flags::FeatureFlagAppExt;
use futures::{channel::mpsc, future, AsyncReadExt, Future, StreamExt};
use gpui::{AsyncAppContext, Entity, ImageData, ModelContext, ModelHandle, Task};
use postage::{sink::Sink, watch};
use rpc::proto::{RequestMessage, UsersResponse};
-use staff_mode::StaffMode;
use std::sync::{Arc, Weak};
use util::http::HttpClient;
use util::TryFutureExt as _;
@@ -145,26 +145,23 @@ impl UserStore {
let fetch_metrics_id =
client.request(proto::GetPrivateUserInfo {}).log_err();
let (user, info) = futures::join!(fetch_user, fetch_metrics_id);
- cx.read(|cx| {
- client.telemetry.set_authenticated_user_info(
- info.as_ref().map(|info| info.metrics_id.clone()),
- info.as_ref().map(|info| info.staff).unwrap_or(false),
- cx,
- )
- });
- cx.update(|cx| {
- cx.update_default_global(|staff_mode: &mut StaffMode, _| {
- if !staff_mode.0 {
- *staff_mode = StaffMode(
- info.as_ref()
- .map(|info| info.staff)
- .unwrap_or_default(),
- )
- }
- ()
+ if let Some(info) = info {
+ cx.update(|cx| {
+ cx.update_flags(info.staff, info.flags);
+ client.telemetry.set_authenticated_user_info(
+ Some(info.metrics_id.clone()),
+ info.staff,
+ cx,
+ )
});
- });
+ } else {
+ cx.read(|cx| {
+ client
+ .telemetry
+ .set_authenticated_user_info(None, false, cx)
+ });
+ }
current_user_tx.send(user).await.ok();
@@ -249,3 +249,22 @@ CREATE UNIQUE INDEX "index_channel_buffer_collaborators_on_channel_id_and_replic
CREATE INDEX "index_channel_buffer_collaborators_on_connection_server_id" ON "channel_buffer_collaborators" ("connection_server_id");
CREATE INDEX "index_channel_buffer_collaborators_on_connection_id" ON "channel_buffer_collaborators" ("connection_id");
CREATE UNIQUE INDEX "index_channel_buffer_collaborators_on_channel_id_connection_id_and_server_id" ON "channel_buffer_collaborators" ("channel_id", "connection_id", "connection_server_id");
+
+
+CREATE TABLE "feature_flags" (
+ "id" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "flag" TEXT NOT NULL UNIQUE
+);
+
+CREATE INDEX "index_feature_flags" ON "feature_flags" ("id");
+
+
+CREATE TABLE "user_features" (
+ "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+ "feature_id" INTEGER NOT NULL REFERENCES feature_flags (id) ON DELETE CASCADE,
+ PRIMARY KEY (user_id, feature_id)
+);
+
+CREATE UNIQUE INDEX "index_user_features_user_id_and_feature_id" ON "user_features" ("user_id", "feature_id");
+CREATE INDEX "index_user_features_on_user_id" ON "user_features" ("user_id");
+CREATE INDEX "index_user_features_on_feature_id" ON "user_features" ("feature_id");
@@ -0,0 +1,16 @@
+CREATE TABLE "feature_flags" (
+ "id" SERIAL PRIMARY KEY,
+ "flag" VARCHAR(255) NOT NULL UNIQUE
+);
+
+CREATE UNIQUE INDEX "index_feature_flags" ON "feature_flags" ("id");
+
+CREATE TABLE "user_features" (
+ "user_id" INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ "feature_id" INTEGER NOT NULL REFERENCES feature_flags(id) ON DELETE CASCADE,
+ PRIMARY KEY (user_id, feature_id)
+);
+
+CREATE UNIQUE INDEX "index_user_features_user_id_and_feature_id" ON "user_features" ("user_id", "feature_id");
+CREATE INDEX "index_user_features_on_user_id" ON "user_features" ("user_id");
+CREATE INDEX "index_user_features_on_feature_id" ON "user_features" ("feature_id");
@@ -125,3 +125,4 @@ id_type!(ServerId);
id_type!(SignupId);
id_type!(UserId);
id_type!(ChannelBufferCollaboratorId);
+id_type!(FlagId);
@@ -240,4 +240,58 @@ impl Database {
result.push('%');
result
}
+
+ #[cfg(debug_assertions)]
+ pub async fn create_user_flag(&self, flag: &str) -> Result<FlagId> {
+ self.transaction(|tx| async move {
+ let flag = feature_flag::Entity::insert(feature_flag::ActiveModel {
+ flag: ActiveValue::set(flag.to_string()),
+ ..Default::default()
+ })
+ .exec(&*tx)
+ .await?
+ .last_insert_id;
+
+ Ok(flag)
+ })
+ .await
+ }
+
+ #[cfg(debug_assertions)]
+ pub async fn add_user_flag(&self, user: UserId, flag: FlagId) -> Result<()> {
+ self.transaction(|tx| async move {
+ user_feature::Entity::insert(user_feature::ActiveModel {
+ user_id: ActiveValue::set(user),
+ feature_id: ActiveValue::set(flag),
+ })
+ .exec(&*tx)
+ .await?;
+
+ Ok(())
+ })
+ .await
+ }
+
+ pub async fn get_user_flags(&self, user: UserId) -> Result<Vec<String>> {
+ self.transaction(|tx| async move {
+ #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+ enum QueryAs {
+ Flag,
+ }
+
+ let flags = user::Model {
+ id: user,
+ ..Default::default()
+ }
+ .find_linked(user::UserFlags)
+ .select_only()
+ .column(feature_flag::Column::Flag)
+ .into_values::<_, QueryAs>()
+ .all(&*tx)
+ .await?;
+
+ Ok(flags)
+ })
+ .await
+ }
}
@@ -7,6 +7,7 @@ pub mod channel_buffer_collaborator;
pub mod channel_member;
pub mod channel_path;
pub mod contact;
+pub mod feature_flag;
pub mod follower;
pub mod language_server;
pub mod project;
@@ -16,6 +17,7 @@ pub mod room_participant;
pub mod server;
pub mod signup;
pub mod user;
+pub mod user_feature;
pub mod worktree;
pub mod worktree_diagnostic_summary;
pub mod worktree_entry;
@@ -0,0 +1,40 @@
+use sea_orm::entity::prelude::*;
+
+use crate::db::FlagId;
+
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "feature_flags")]
+pub struct Model {
+ #[sea_orm(primary_key)]
+ pub id: FlagId,
+ pub flag: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+ #[sea_orm(has_many = "super::user_feature::Entity")]
+ UserFeature,
+}
+
+impl Related<super::user_feature::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::UserFeature.def()
+ }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
+
+pub struct FlaggedUsers;
+
+impl Linked for FlaggedUsers {
+ type FromEntity = Entity;
+
+ type ToEntity = super::user::Entity;
+
+ fn link(&self) -> Vec<RelationDef> {
+ vec![
+ super::user_feature::Relation::Flag.def().rev(),
+ super::user_feature::Relation::User.def(),
+ ]
+ }
+}
@@ -28,6 +28,8 @@ pub enum Relation {
HostedProjects,
#[sea_orm(has_many = "super::channel_member::Entity")]
ChannelMemberships,
+ #[sea_orm(has_many = "super::user_feature::Entity")]
+ UserFeatures,
}
impl Related<super::access_token::Entity> for Entity {
@@ -54,4 +56,25 @@ impl Related<super::channel_member::Entity> for Entity {
}
}
+impl Related<super::user_feature::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::UserFeatures.def()
+ }
+}
+
impl ActiveModelBehavior for ActiveModel {}
+
+pub struct UserFlags;
+
+impl Linked for UserFlags {
+ type FromEntity = Entity;
+
+ type ToEntity = super::feature_flag::Entity;
+
+ fn link(&self) -> Vec<RelationDef> {
+ vec![
+ super::user_feature::Relation::User.def().rev(),
+ super::user_feature::Relation::Flag.def(),
+ ]
+ }
+}
@@ -0,0 +1,42 @@
+use sea_orm::entity::prelude::*;
+
+use crate::db::{FlagId, UserId};
+
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "user_features")]
+pub struct Model {
+ #[sea_orm(primary_key)]
+ pub user_id: UserId,
+ #[sea_orm(primary_key)]
+ pub feature_id: FlagId,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+ #[sea_orm(
+ belongs_to = "super::feature_flag::Entity",
+ from = "Column::FeatureId",
+ to = "super::feature_flag::Column::Id"
+ )]
+ Flag,
+ #[sea_orm(
+ belongs_to = "super::user::Entity",
+ from = "Column::UserId",
+ to = "super::user::Column::Id"
+ )]
+ User,
+}
+
+impl Related<super::feature_flag::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::Flag.def()
+ }
+}
+
+impl Related<super::user::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::User.def()
+ }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
@@ -1,5 +1,6 @@
mod buffer_tests;
mod db_tests;
+mod feature_flag_tests;
use super::*;
use gpui::executor::Background;
@@ -0,0 +1,60 @@
+use crate::{
+ db::{Database, NewUserParams},
+ test_both_dbs,
+};
+use std::sync::Arc;
+
+test_both_dbs!(
+ test_get_user_flags,
+ test_get_user_flags_postgres,
+ test_get_user_flags_sqlite
+);
+
+async fn test_get_user_flags(db: &Arc<Database>) {
+ let user_1 = db
+ .create_user(
+ &format!("user1@example.com"),
+ false,
+ NewUserParams {
+ github_login: format!("user1"),
+ github_user_id: 1,
+ invite_count: 0,
+ },
+ )
+ .await
+ .unwrap()
+ .user_id;
+
+ let user_2 = db
+ .create_user(
+ &format!("user2@example.com"),
+ false,
+ NewUserParams {
+ github_login: format!("user2"),
+ github_user_id: 2,
+ invite_count: 0,
+ },
+ )
+ .await
+ .unwrap()
+ .user_id;
+
+ const CHANNELS_ALPHA: &'static str = "channels-alpha";
+ const NEW_SEARCH: &'static str = "new-search";
+
+ let channels_flag = db.create_user_flag(CHANNELS_ALPHA).await.unwrap();
+ let search_flag = db.create_user_flag(NEW_SEARCH).await.unwrap();
+
+ db.add_user_flag(user_1, channels_flag).await.unwrap();
+ db.add_user_flag(user_1, search_flag).await.unwrap();
+
+ db.add_user_flag(user_2, channels_flag).await.unwrap();
+
+ let mut user_1_flags = db.get_user_flags(user_1).await.unwrap();
+ user_1_flags.sort();
+ assert_eq!(user_1_flags, &[CHANNELS_ALPHA, NEW_SEARCH]);
+
+ let mut user_2_flags = db.get_user_flags(user_2).await.unwrap();
+ user_2_flags.sort();
+ assert_eq!(user_2_flags, &[CHANNELS_ALPHA]);
+}
@@ -2609,20 +2609,19 @@ async fn get_private_user_info(
response: Response<proto::GetPrivateUserInfo>,
session: Session,
) -> Result<()> {
- let metrics_id = session
- .db()
- .await
- .get_user_metrics_id(session.user_id)
- .await?;
- let user = session
- .db()
- .await
+ let db = session.db().await;
+
+ let metrics_id = db.get_user_metrics_id(session.user_id).await?;
+ let user = db
.get_user_by_id(session.user_id)
.await?
.ok_or_else(|| anyhow!("user not found"))?;
+ let flags = db.get_user_flags(session.user_id).await?;
+
response.send(proto::GetPrivateUserInfoResponse {
metrics_id,
staff: user.admin,
+ flags,
})?;
Ok(())
}
@@ -40,7 +40,7 @@ picker = { path = "../picker" }
project = { path = "../project" }
recent_projects = {path = "../recent_projects"}
settings = { path = "../settings" }
-staff_mode = {path = "../staff_mode"}
+feature_flags = {path = "../feature_flags"}
theme = { path = "../theme" }
theme_selector = { path = "../theme_selector" }
vcs_menu = { path = "../vcs_menu" }
@@ -9,6 +9,8 @@ use client::{proto::PeerId, Client, Contact, User, UserStore};
use context_menu::{ContextMenu, ContextMenuItem};
use db::kvp::KEY_VALUE_STORE;
use editor::{Cancel, Editor};
+
+use feature_flags::{ChannelsAlpha, FeatureFlagAppExt, FeatureFlagViewExt};
use futures::StreamExt;
use fuzzy::{match_strings, StringMatchCandidate};
use gpui::{
@@ -33,7 +35,6 @@ use panel_settings::{CollaborationPanelDockPosition, CollaborationPanelSettings}
use project::{Fs, Project};
use serde_derive::{Deserialize, Serialize};
use settings::SettingsStore;
-use staff_mode::StaffMode;
use std::{borrow::Cow, mem, sync::Arc};
use theme::{components::ComponentExt, IconButton};
use util::{iife, ResultExt, TryFutureExt};
@@ -182,9 +183,9 @@ pub struct CollabPanel {
}
#[derive(Serialize, Deserialize)]
-struct SerializedChannelsPanel {
+struct SerializedCollabPanel {
width: Option<f32>,
- collapsed_channels: Vec<ChannelId>,
+ collapsed_channels: Option<Vec<ChannelId>>,
}
#[derive(Debug)]
@@ -472,9 +473,10 @@ impl CollabPanel {
}));
this.subscriptions
.push(cx.observe(&active_call, |this, _, cx| this.update_entries(true, cx)));
- this.subscriptions.push(
- cx.observe_global::<StaffMode, _>(move |this, cx| this.update_entries(true, cx)),
- );
+ this.subscriptions
+ .push(cx.observe_flag::<ChannelsAlpha, _>(move |_, this, cx| {
+ this.update_entries(true, cx)
+ }));
this.subscriptions.push(cx.subscribe(
&this.channel_store,
|this, _channel_store, e, cx| match e {
@@ -510,7 +512,7 @@ impl CollabPanel {
.log_err()
.flatten()
{
- Some(serde_json::from_str::<SerializedChannelsPanel>(&panel)?)
+ Some(serde_json::from_str::<SerializedCollabPanel>(&panel)?)
} else {
None
};
@@ -520,7 +522,9 @@ impl CollabPanel {
if let Some(serialized_panel) = serialized_panel {
panel.update(cx, |panel, cx| {
panel.width = serialized_panel.width;
- panel.collapsed_channels = serialized_panel.collapsed_channels;
+ panel.collapsed_channels = serialized_panel
+ .collapsed_channels
+ .unwrap_or_else(|| Vec::new());
cx.notify();
});
}
@@ -537,9 +541,9 @@ impl CollabPanel {
KEY_VALUE_STORE
.write_kvp(
COLLABORATION_PANEL_KEY.into(),
- serde_json::to_string(&SerializedChannelsPanel {
+ serde_json::to_string(&SerializedCollabPanel {
width,
- collapsed_channels,
+ collapsed_channels: Some(collapsed_channels),
})?,
)
.await?;
@@ -672,7 +676,8 @@ impl CollabPanel {
}
let mut request_entries = Vec::new();
- if self.include_channels_section(cx) {
+
+ if cx.has_flag::<ChannelsAlpha>() {
self.entries.push(ListEntry::Header(Section::Channels, 0));
if channel_store.channel_count() > 0 || self.channel_editing_state.is_some() {
@@ -1909,14 +1914,6 @@ impl CollabPanel {
.into_any()
}
- fn include_channels_section(&self, cx: &AppContext) -> bool {
- if cx.has_global::<StaffMode>() {
- cx.global::<StaffMode>().0
- } else {
- false
- }
- }
-
fn deploy_channel_context_menu(
&mut self,
position: Option<Vector2F>,
@@ -1,11 +1,11 @@
[package]
-name = "staff_mode"
+name = "feature_flags"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
-path = "src/staff_mode.rs"
+path = "src/feature_flags.rs"
[dependencies]
gpui = { path = "../gpui" }
@@ -0,0 +1,79 @@
+use gpui::{AppContext, Subscription, ViewContext};
+
+#[derive(Default)]
+struct FeatureFlags {
+ flags: Vec<String>,
+ staff: bool,
+}
+
+impl FeatureFlags {
+ fn has_flag(&self, flag: &str) -> bool {
+ self.staff || self.flags.iter().find(|f| f.as_str() == flag).is_some()
+ }
+}
+
+pub trait FeatureFlag {
+ const NAME: &'static str;
+}
+
+pub enum ChannelsAlpha {}
+
+impl FeatureFlag for ChannelsAlpha {
+ const NAME: &'static str = "channels_alpha";
+}
+
+pub trait FeatureFlagViewExt<V: 'static> {
+ fn observe_flag<T: FeatureFlag, F>(&mut self, callback: F) -> Subscription
+ where
+ F: Fn(bool, &mut V, &mut ViewContext<V>) + 'static;
+}
+
+impl<V: 'static> FeatureFlagViewExt<V> for ViewContext<'_, '_, V> {
+ fn observe_flag<T: FeatureFlag, F>(&mut self, callback: F) -> Subscription
+ where
+ F: Fn(bool, &mut V, &mut ViewContext<V>) + 'static,
+ {
+ self.observe_global::<FeatureFlags, _>(move |v, cx| {
+ let feature_flags = cx.global::<FeatureFlags>();
+ callback(feature_flags.has_flag(<T as FeatureFlag>::NAME), v, cx);
+ })
+ }
+}
+
+pub trait FeatureFlagAppExt {
+ fn update_flags(&mut self, staff: bool, flags: Vec<String>);
+ fn set_staff(&mut self, staff: bool);
+ fn has_flag<T: FeatureFlag>(&self) -> bool;
+ fn is_staff(&self) -> bool;
+}
+
+impl FeatureFlagAppExt for AppContext {
+ fn update_flags(&mut self, staff: bool, flags: Vec<String>) {
+ self.update_default_global::<FeatureFlags, _, _>(|feature_flags, _| {
+ feature_flags.staff = staff;
+ feature_flags.flags = flags;
+ })
+ }
+
+ fn set_staff(&mut self, staff: bool) {
+ self.update_default_global::<FeatureFlags, _, _>(|feature_flags, _| {
+ feature_flags.staff = staff;
+ })
+ }
+
+ fn has_flag<T: FeatureFlag>(&self) -> bool {
+ if self.has_global::<FeatureFlags>() {
+ self.global::<FeatureFlags>().has_flag(T::NAME)
+ } else {
+ false
+ }
+ }
+
+ fn is_staff(&self) -> bool {
+ if self.has_global::<FeatureFlags>() {
+ return self.global::<FeatureFlags>().staff;
+ } else {
+ false
+ }
+ }
+}
@@ -1114,6 +1114,7 @@ message GetPrivateUserInfo {}
message GetPrivateUserInfoResponse {
string metrics_id = 1;
bool staff = 2;
+ repeated string flags = 3;
}
// Entities
@@ -16,7 +16,7 @@ collections = { path = "../collections" }
gpui = { path = "../gpui" }
sqlez = { path = "../sqlez" }
fs = { path = "../fs" }
-staff_mode = { path = "../staff_mode" }
+feature_flags = { path = "../feature_flags" }
util = { path = "../util" }
anyhow.workspace = true
@@ -1,36 +0,0 @@
-use gpui::AppContext;
-
-#[derive(Debug, Default)]
-pub struct StaffMode(pub bool);
-
-impl std::ops::Deref for StaffMode {
- type Target = bool;
-
- fn deref(&self) -> &Self::Target {
- &self.0
- }
-}
-
-/// Despite what the type system requires me to tell you, the init function will only be called a once
-/// as soon as we know that the staff mode is enabled.
-pub fn staff_mode<F: FnMut(&mut AppContext) + 'static>(cx: &mut AppContext, mut init: F) {
- if **cx.default_global::<StaffMode>() {
- init(cx)
- } else {
- let mut once = Some(());
- cx.observe_global::<StaffMode, _>(move |cx| {
- if **cx.global::<StaffMode>() && once.take().is_some() {
- init(cx);
- }
- })
- .detach();
- }
-}
-
-/// Immediately checks and runs the init function if the staff mode is not enabled.
-/// This is only included for symettry with staff_mode() above
-pub fn not_staff_mode<F: FnOnce(&mut AppContext) + 'static>(cx: &mut AppContext, init: F) {
- if !**cx.default_global::<StaffMode>() {
- init(cx)
- }
-}
@@ -16,7 +16,7 @@ gpui = { path = "../gpui" }
picker = { path = "../picker" }
theme = { path = "../theme" }
settings = { path = "../settings" }
-staff_mode = { path = "../staff_mode" }
+feature_flags = { path = "../feature_flags" }
workspace = { path = "../workspace" }
util = { path = "../util" }
log.workspace = true
@@ -1,9 +1,9 @@
+use feature_flags::FeatureFlagAppExt;
use fs::Fs;
use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
use gpui::{actions, elements::*, AnyElement, AppContext, Element, MouseState, ViewContext};
use picker::{Picker, PickerDelegate, PickerEvent};
use settings::{update_settings_file, SettingsStore};
-use staff_mode::StaffMode;
use std::sync::Arc;
use theme::{Theme, ThemeMeta, ThemeRegistry, ThemeSettings};
use util::ResultExt;
@@ -54,7 +54,7 @@ impl ThemeSelectorDelegate {
fn new(fs: Arc<dyn Fs>, cx: &mut ViewContext<ThemeSelector>) -> Self {
let original_theme = theme::current(cx).clone();
- let staff_mode = **cx.default_global::<StaffMode>();
+ let staff_mode = cx.is_staff();
let registry = cx.global::<Arc<ThemeRegistry>>();
let mut theme_names = registry.list(staff_mode).collect::<Vec<_>>();
theme_names.sort_unstable_by(|a, b| a.is_light.cmp(&b.is_light).then(a.name.cmp(&b.name)));
@@ -60,7 +60,7 @@ quick_action_bar = { path = "../quick_action_bar" }
recent_projects = { path = "../recent_projects" }
rpc = { path = "../rpc" }
settings = { path = "../settings" }
-staff_mode = { path = "../staff_mode" }
+feature_flags = { path = "../feature_flags" }
sum_tree = { path = "../sum_tree" }
text = { path = "../text" }
terminal_view = { path = "../terminal_view" }
@@ -1,6 +1,7 @@
use anyhow::{anyhow, Result};
use async_trait::async_trait;
use collections::HashMap;
+use feature_flags::FeatureFlagAppExt;
use futures::{future::BoxFuture, FutureExt, StreamExt};
use gpui::AppContext;
use language::{LanguageRegistry, LanguageServerName, LspAdapter, LspAdapterDelegate};
@@ -9,7 +10,6 @@ use node_runtime::NodeRuntime;
use serde_json::json;
use settings::{KeymapFile, SettingsJsonSchemaParams, SettingsStore};
use smol::fs;
-use staff_mode::StaffMode;
use std::{
any::Any,
ffi::OsString,
@@ -104,7 +104,7 @@ impl LspAdapter for JsonLspAdapter {
cx: &mut AppContext,
) -> Option<BoxFuture<'static, serde_json::Value>> {
let action_names = cx.all_action_names().collect::<Vec<_>>();
- let staff_mode = cx.default_global::<StaffMode>().0;
+ let staff_mode = cx.is_staff();
let language_names = &self.languages.language_names();
let settings_schema = cx.global::<SettingsStore>().json_schema(
&SettingsJsonSchemaParams {
@@ -53,8 +53,6 @@ use uuid::Uuid;
use welcome::{show_welcome_experience, FIRST_OPEN};
use fs::RealFs;
-#[cfg(debug_assertions)]
-use staff_mode::StaffMode;
use util::{channel::RELEASE_CHANNEL, paths, ResultExt, TryFutureExt};
use workspace::AppState;
use zed::{
@@ -122,7 +120,10 @@ fn main() {
cx.set_global(*RELEASE_CHANNEL);
#[cfg(debug_assertions)]
- cx.set_global(StaffMode(true));
+ {
+ use feature_flags::FeatureFlagAppExt;
+ cx.set_staff(true);
+ }
let mut store = SettingsStore::default();
store