
This is the core change: https://github.com/zed-industries/zed/pull/26758/files#diff-044302c0d57147af17e68a0009fee3e8dcdfb4f32c27a915e70cfa80e987f765R1052 TODO: - [x] Use AsyncFn instead of Fn() -> Future in GPUI spawn methods - [x] Implement it in the whole app - [x] Implement it in the debugger - [x] Glance at the RPC crate, and see if those box future methods can be switched over. Answer: It can't directly, as you can't make an AsyncFn* into a trait object. There's ways around that, but they're all more complex than just keeping the code as is. - [ ] Fix platform specific code Release Notes: - N/A
278 lines
8.3 KiB
Rust
278 lines
8.3 KiB
Rust
use futures::channel::oneshot;
|
|
use futures::{select_biased, FutureExt};
|
|
use gpui::{App, Context, Global, Subscription, Task, Window};
|
|
use std::cell::RefCell;
|
|
use std::rc::Rc;
|
|
use std::sync::LazyLock;
|
|
use std::time::Duration;
|
|
use std::{future::Future, pin::Pin, task::Poll};
|
|
|
|
#[derive(Default)]
|
|
struct FeatureFlags {
|
|
flags: Vec<String>,
|
|
staff: bool,
|
|
}
|
|
|
|
pub static ZED_DISABLE_STAFF: LazyLock<bool> = LazyLock::new(|| {
|
|
std::env::var("ZED_DISABLE_STAFF").map_or(false, |value| !value.is_empty() && value != "0")
|
|
});
|
|
|
|
impl FeatureFlags {
|
|
fn has_flag<T: FeatureFlag>(&self) -> bool {
|
|
if self.staff && T::enabled_for_staff() {
|
|
return true;
|
|
}
|
|
|
|
#[cfg(debug_assertions)]
|
|
if T::enabled_in_development() {
|
|
return true;
|
|
}
|
|
|
|
self.flags.iter().any(|f| f.as_str() == T::NAME)
|
|
}
|
|
}
|
|
|
|
impl Global for FeatureFlags {}
|
|
|
|
/// To create a feature flag, implement this trait on a trivial type and use it as
|
|
/// a generic parameter when called [`FeatureFlagAppExt::has_flag`].
|
|
///
|
|
/// Feature flags are enabled for members of Zed staff by default. To disable this behavior
|
|
/// so you can test flags being disabled, set ZED_DISABLE_STAFF=1 in your environment,
|
|
/// which will force Zed to treat the current user as non-staff.
|
|
pub trait FeatureFlag {
|
|
const NAME: &'static str;
|
|
|
|
/// Returns whether this feature flag is enabled for Zed staff.
|
|
fn enabled_for_staff() -> bool {
|
|
true
|
|
}
|
|
|
|
fn enabled_in_development() -> bool {
|
|
Self::enabled_for_staff() && !*ZED_DISABLE_STAFF
|
|
}
|
|
}
|
|
|
|
pub struct Assistant2FeatureFlag;
|
|
|
|
impl FeatureFlag for Assistant2FeatureFlag {
|
|
const NAME: &'static str = "assistant2";
|
|
}
|
|
|
|
pub struct PredictEditsFeatureFlag;
|
|
impl FeatureFlag for PredictEditsFeatureFlag {
|
|
const NAME: &'static str = "predict-edits";
|
|
}
|
|
|
|
pub struct PredictEditsRateCompletionsFeatureFlag;
|
|
impl FeatureFlag for PredictEditsRateCompletionsFeatureFlag {
|
|
const NAME: &'static str = "predict-edits-rate-completions";
|
|
}
|
|
|
|
/// A feature flag that controls whether "non eager mode" (holding `alt` to preview) is publicized.
|
|
pub struct PredictEditsNonEagerModeFeatureFlag;
|
|
impl FeatureFlag for PredictEditsNonEagerModeFeatureFlag {
|
|
const NAME: &'static str = "predict-edits-non-eager-mode";
|
|
|
|
fn enabled_for_staff() -> bool {
|
|
// Don't show to staff so it doesn't leak into media for the launch.
|
|
false
|
|
}
|
|
}
|
|
|
|
pub struct Remoting {}
|
|
impl FeatureFlag for Remoting {
|
|
const NAME: &'static str = "remoting";
|
|
}
|
|
|
|
pub struct LanguageModels {}
|
|
impl FeatureFlag for LanguageModels {
|
|
const NAME: &'static str = "language-models";
|
|
}
|
|
|
|
pub struct LlmClosedBeta {}
|
|
impl FeatureFlag for LlmClosedBeta {
|
|
const NAME: &'static str = "llm-closed-beta";
|
|
}
|
|
|
|
pub struct ZedPro {}
|
|
impl FeatureFlag for ZedPro {
|
|
const NAME: &'static str = "zed-pro";
|
|
}
|
|
|
|
pub struct NotebookFeatureFlag;
|
|
|
|
impl FeatureFlag for NotebookFeatureFlag {
|
|
const NAME: &'static str = "notebooks";
|
|
}
|
|
|
|
pub struct AutoCommand {}
|
|
impl FeatureFlag for AutoCommand {
|
|
const NAME: &'static str = "auto-command";
|
|
|
|
fn enabled_for_staff() -> bool {
|
|
false
|
|
}
|
|
}
|
|
|
|
pub struct Debugger {}
|
|
impl FeatureFlag for Debugger {
|
|
const NAME: &'static str = "debugger";
|
|
}
|
|
|
|
pub trait FeatureFlagViewExt<V: 'static> {
|
|
fn observe_flag<T: FeatureFlag, F>(&mut self, window: &Window, callback: F) -> Subscription
|
|
where
|
|
F: Fn(bool, &mut V, &mut Window, &mut Context<V>) + Send + Sync + 'static;
|
|
|
|
fn when_flag_enabled<T: FeatureFlag>(
|
|
&mut self,
|
|
window: &mut Window,
|
|
callback: impl Fn(&mut V, &mut Window, &mut Context<V>) + Send + Sync + 'static,
|
|
);
|
|
}
|
|
|
|
impl<V> FeatureFlagViewExt<V> for Context<'_, V>
|
|
where
|
|
V: 'static,
|
|
{
|
|
fn observe_flag<T: FeatureFlag, F>(&mut self, window: &Window, callback: F) -> Subscription
|
|
where
|
|
F: Fn(bool, &mut V, &mut Window, &mut Context<V>) + 'static,
|
|
{
|
|
self.observe_global_in::<FeatureFlags>(window, move |v, window, cx| {
|
|
let feature_flags = cx.global::<FeatureFlags>();
|
|
callback(feature_flags.has_flag::<T>(), v, window, cx);
|
|
})
|
|
}
|
|
|
|
fn when_flag_enabled<T: FeatureFlag>(
|
|
&mut self,
|
|
window: &mut Window,
|
|
callback: impl Fn(&mut V, &mut Window, &mut Context<V>) + Send + Sync + 'static,
|
|
) {
|
|
if self
|
|
.try_global::<FeatureFlags>()
|
|
.is_some_and(|f| f.has_flag::<T>())
|
|
|| cfg!(debug_assertions) && T::enabled_in_development()
|
|
{
|
|
self.defer_in(window, move |view, window, cx| {
|
|
callback(view, window, cx);
|
|
});
|
|
return;
|
|
}
|
|
let subscription = Rc::new(RefCell::new(None));
|
|
let inner = self.observe_global_in::<FeatureFlags>(window, {
|
|
let subscription = subscription.clone();
|
|
move |v, window, cx| {
|
|
let feature_flags = cx.global::<FeatureFlags>();
|
|
if feature_flags.has_flag::<T>() {
|
|
callback(v, window, cx);
|
|
subscription.take();
|
|
}
|
|
}
|
|
});
|
|
subscription.borrow_mut().replace(inner);
|
|
}
|
|
}
|
|
|
|
pub trait FeatureFlagAppExt {
|
|
fn wait_for_flag<T: FeatureFlag>(&mut self) -> WaitForFlag;
|
|
|
|
/// Waits for the specified feature flag to resolve, up to the given timeout.
|
|
fn wait_for_flag_or_timeout<T: FeatureFlag>(&mut self, timeout: Duration) -> Task<bool>;
|
|
|
|
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;
|
|
|
|
fn observe_flag<T: FeatureFlag, F>(&mut self, callback: F) -> Subscription
|
|
where
|
|
F: FnMut(bool, &mut App) + 'static;
|
|
}
|
|
|
|
impl FeatureFlagAppExt for App {
|
|
fn update_flags(&mut self, staff: bool, flags: Vec<String>) {
|
|
let feature_flags = self.default_global::<FeatureFlags>();
|
|
feature_flags.staff = staff;
|
|
feature_flags.flags = flags;
|
|
}
|
|
|
|
fn set_staff(&mut self, staff: bool) {
|
|
let feature_flags = self.default_global::<FeatureFlags>();
|
|
feature_flags.staff = staff;
|
|
}
|
|
|
|
fn has_flag<T: FeatureFlag>(&self) -> bool {
|
|
self.try_global::<FeatureFlags>()
|
|
.map(|flags| flags.has_flag::<T>())
|
|
.unwrap_or_else(|| T::enabled_in_development())
|
|
}
|
|
|
|
fn is_staff(&self) -> bool {
|
|
self.try_global::<FeatureFlags>()
|
|
.map(|flags| flags.staff)
|
|
.unwrap_or(false)
|
|
}
|
|
|
|
fn observe_flag<T: FeatureFlag, F>(&mut self, mut callback: F) -> Subscription
|
|
where
|
|
F: FnMut(bool, &mut App) + 'static,
|
|
{
|
|
self.observe_global::<FeatureFlags>(move |cx| {
|
|
let feature_flags = cx.global::<FeatureFlags>();
|
|
callback(feature_flags.has_flag::<T>(), cx);
|
|
})
|
|
}
|
|
|
|
fn wait_for_flag<T: FeatureFlag>(&mut self) -> WaitForFlag {
|
|
let (tx, rx) = oneshot::channel::<bool>();
|
|
let mut tx = Some(tx);
|
|
let subscription: Option<Subscription>;
|
|
|
|
match self.try_global::<FeatureFlags>() {
|
|
Some(feature_flags) => {
|
|
subscription = None;
|
|
tx.take().unwrap().send(feature_flags.has_flag::<T>()).ok();
|
|
}
|
|
None => {
|
|
subscription = Some(self.observe_global::<FeatureFlags>(move |cx| {
|
|
let feature_flags = cx.global::<FeatureFlags>();
|
|
if let Some(tx) = tx.take() {
|
|
tx.send(feature_flags.has_flag::<T>()).ok();
|
|
}
|
|
}));
|
|
}
|
|
}
|
|
|
|
WaitForFlag(rx, subscription)
|
|
}
|
|
|
|
fn wait_for_flag_or_timeout<T: FeatureFlag>(&mut self, timeout: Duration) -> Task<bool> {
|
|
let wait_for_flag = self.wait_for_flag::<T>();
|
|
|
|
self.spawn(async move |_cx| {
|
|
let mut wait_for_flag = wait_for_flag.fuse();
|
|
let mut timeout = FutureExt::fuse(smol::Timer::after(timeout));
|
|
|
|
select_biased! {
|
|
is_enabled = wait_for_flag => is_enabled,
|
|
_ = timeout => false,
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
pub struct WaitForFlag(oneshot::Receiver<bool>, Option<Subscription>);
|
|
|
|
impl Future for WaitForFlag {
|
|
type Output = bool;
|
|
|
|
fn poll(mut self: Pin<&mut Self>, cx: &mut core::task::Context<'_>) -> Poll<Self::Output> {
|
|
self.0.poll_unpin(cx).map(|result| {
|
|
self.1.take();
|
|
result.unwrap_or(false)
|
|
})
|
|
}
|
|
}
|