Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature_flags: Add FeatureFlag suffix to feature flag types (#29392)

Browse source 
This PR adds the `FeatureFlag` suffix to the feature flag types that
were missing them.

This makes the names easier to search in the codebase.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-04-25 00:07:49 -04:00 • committed by GitHub
parent a77db45865
commit 187f851613
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/agent/src/inline_prompt_editor.rs
View file

@ -13,7 +13,7 @@ use editor::{
Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, GutterDimensions, MultiBuffer, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, GutterDimensions, MultiBuffer,
actions::{MoveDown, MoveUp}, actions::{MoveDown, MoveUp},
}; };
use feature_flags::{FeatureFlagAppExt as _, ZedPro}; use feature_flags::{FeatureFlagAppExt as _, ZedProFeatureFlag};
use fs::Fs; use fs::Fs;
use gpui::{ use gpui::{
AnyElement, App, ClickEvent, Context, CursorStyle, Entity, EventEmitter, FocusHandle, AnyElement, App, ClickEvent, Context, CursorStyle, Entity, EventEmitter, FocusHandle,
@ -132,7 +132,7 @@ impl<T: 'static> Render for PromptEditor<T> {
let error_message = SharedString::from(error.to_string()); let error_message = SharedString::from(error.to_string());
if error.error_code() == proto::ErrorCode::RateLimitExceeded if error.error_code() == proto::ErrorCode::RateLimitExceeded
&& cx.has_flag::<ZedPro>() && cx.has_flag::<ZedProFeatureFlag>()
{ {
el.child( el.child(
v_flex() v_flex()
@ -931,7 +931,7 @@ impl PromptEditor<BufferCodegen> {
.update(cx, |editor, _| editor.set_read_only(false)); .update(cx, |editor, _| editor.set_read_only(false));
} }
CodegenStatus::Error(error) => { CodegenStatus::Error(error) => {
if cx.has_flag::<ZedPro>() if cx.has_flag::<ZedProFeatureFlag>()
&& error.error_code() == proto::ErrorCode::RateLimitExceeded && error.error_code() == proto::ErrorCode::RateLimitExceeded
&& !dismissed_rate_limit_notice() && !dismissed_rate_limit_notice()
{ {

2
crates/agent/src/thread.rs
View file

@ -2097,7 +2097,7 @@ impl Thread {
} }
pub fn auto_capture_telemetry(&mut self, cx: &mut Context<Self>) { pub fn auto_capture_telemetry(&mut self, cx: &mut Context<Self>) {
if !cx.has_flag::<feature_flags::ThreadAutoCapture>() { if !cx.has_flag::<feature_flags::ThreadAutoCaptureFeatureFlag>() {
return; return;
} }

6
crates/assistant/src/inline_assistant.rs
View file

@ -18,7 +18,7 @@ use editor::{
}, },
}; };
use feature_flags::{ use feature_flags::{
Assistant2FeatureFlag, FeatureFlagAppExt as _, FeatureFlagViewExt as _, ZedPro, Assistant2FeatureFlag, FeatureFlagAppExt as _, FeatureFlagViewExt as _, ZedProFeatureFlag,
}; };
use fs::Fs; use fs::Fs;
use futures::{ use futures::{
@ -1652,7 +1652,7 @@ impl Render for PromptEditor {
let error_message = SharedString::from(error.to_string()); let error_message = SharedString::from(error.to_string());
if error.error_code() == proto::ErrorCode::RateLimitExceeded if error.error_code() == proto::ErrorCode::RateLimitExceeded
&& cx.has_flag::<ZedPro>() && cx.has_flag::<ZedProFeatureFlag>()
{ {
el.child( el.child(
v_flex() v_flex()
@ -1966,7 +1966,7 @@ impl PromptEditor {
.update(cx, |editor, _| editor.set_read_only(false)); .update(cx, |editor, _| editor.set_read_only(false));
} }
CodegenStatus::Error(error) => { CodegenStatus::Error(error) => {
if cx.has_flag::<ZedPro>() if cx.has_flag::<ZedProFeatureFlag>()
&& error.error_code() == proto::ErrorCode::RateLimitExceeded && error.error_code() == proto::ErrorCode::RateLimitExceeded
&& !dismissed_rate_limit_notice() && !dismissed_rate_limit_notice()
{ {

4
crates/debugger_ui/src/debugger_ui.rs
View file

@ -1,7 +1,7 @@
use dap::debugger_settings::DebuggerSettings; use dap::debugger_settings::DebuggerSettings;
use debugger_panel::{DebugPanel, ToggleFocus}; use debugger_panel::{DebugPanel, ToggleFocus};
use editor::Editor; use editor::Editor;
use feature_flags::{Debugger, FeatureFlagViewExt}; use feature_flags::{DebuggerFeatureFlag, FeatureFlagViewExt};
use gpui::{App, EntityInputHandler, actions}; use gpui::{App, EntityInputHandler, actions};
use new_session_modal::NewSessionModal; use new_session_modal::NewSessionModal;
use project::debugger::{self, breakpoint_store::SourceBreakpoint}; use project::debugger::{self, breakpoint_store::SourceBreakpoint};
@ -47,7 +47,7 @@ pub fn init(cx: &mut App) {
return; return;
}; };
cx.when_flag_enabled::<Debugger>(window, |workspace, _, _| { cx.when_flag_enabled::<DebuggerFeatureFlag>(window, |workspace, _, _| {
workspace workspace
.register_action(|workspace, _: &ToggleFocus, window, cx| { .register_action(|workspace, _: &ToggleFocus, window, cx| {
workspace.toggle_panel_focus::<DebugPanel>(window, cx); workspace.toggle_panel_focus::<DebugPanel>(window, cx);

4
crates/editor/src/code_context_menus.rs
View file

@ -1,4 +1,4 @@
use feature_flags::{Debugger, FeatureFlagAppExt as _}; use feature_flags::{DebuggerFeatureFlag, FeatureFlagAppExt as _};
use fuzzy::{StringMatch, StringMatchCandidate}; use fuzzy::{StringMatch, StringMatchCandidate};
use gpui::{ use gpui::{
AnyElement, BackgroundExecutor, Entity, Focusable, FontWeight, ListSizingBehavior, AnyElement, BackgroundExecutor, Entity, Focusable, FontWeight, ListSizingBehavior,
@ -812,7 +812,7 @@ impl CodeActionContents {
actions: Option<Rc<[AvailableCodeAction]>>, actions: Option<Rc<[AvailableCodeAction]>>,
cx: &App, cx: &App,
) -> Self { ) -> Self {
if !cx.has_flag::<Debugger>() { if !cx.has_flag::<DebuggerFeatureFlag>() {
if let Some(tasks) = &mut tasks { if let Some(tasks) = &mut tasks {
tasks tasks
.templates .templates

6
crates/editor/src/editor.rs
View file

@ -71,7 +71,7 @@ use element::{AcceptEditPredictionBinding, LineWithInvisibles, PositionMap, layo
pub use element::{ pub use element::{
CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition, CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition,
}; };
use feature_flags::{Debugger, FeatureFlagAppExt}; use feature_flags::{DebuggerFeatureFlag, FeatureFlagAppExt};
use futures::{ use futures::{
FutureExt, FutureExt,
future::{self, Shared, join}, future::{self, Shared, join},
@ -5159,7 +5159,7 @@ impl Editor {
Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx) Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx)
}); });
let debugger_flag = cx.has_flag::<Debugger>(); let debugger_flag = cx.has_flag::<DebuggerFeatureFlag>();
Some(cx.spawn_in(window, async move |editor, cx| { Some(cx.spawn_in(window, async move |editor, cx| {
let task_context = match task_context { let task_context = match task_context {
@ -9150,7 +9150,7 @@ impl Editor {
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {
if !cx.has_flag::<Debugger>() { if !cx.has_flag::<DebuggerFeatureFlag>() {
return; return;
} }
let source = self let source = self

10
crates/editor/src/element.rs
View file

@ -30,7 +30,7 @@ use crate::{
use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind}; use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
use client::ParticipantIndex; use client::ParticipantIndex;
use collections::{BTreeMap, HashMap}; use collections::{BTreeMap, HashMap};
use feature_flags::{Debugger, FeatureFlagAppExt}; use feature_flags::{DebuggerFeatureFlag, FeatureFlagAppExt};
use file_icons::FileIcons; use file_icons::FileIcons;
use git::{ use git::{
Oid, Oid,
@ -547,7 +547,7 @@ impl EditorElement {
register_action(editor, window, Editor::insert_uuid_v4); register_action(editor, window, Editor::insert_uuid_v4);
register_action(editor, window, Editor::insert_uuid_v7); register_action(editor, window, Editor::insert_uuid_v7);
register_action(editor, window, Editor::open_selections_in_multibuffer); register_action(editor, window, Editor::open_selections_in_multibuffer);
if cx.has_flag::<Debugger>() { if cx.has_flag::<DebuggerFeatureFlag>() {
register_action(editor, window, Editor::toggle_breakpoint); register_action(editor, window, Editor::toggle_breakpoint);
register_action(editor, window, Editor::edit_log_breakpoint); register_action(editor, window, Editor::edit_log_breakpoint);
register_action(editor, window, Editor::enable_breakpoint); register_action(editor, window, Editor::enable_breakpoint);
@ -7037,7 +7037,7 @@ impl Element for EditorElement {
let mut breakpoint_rows = self.editor.update(cx, |editor, cx| { let mut breakpoint_rows = self.editor.update(cx, |editor, cx| {
editor.active_breakpoints(start_row..end_row, window, cx) editor.active_breakpoints(start_row..end_row, window, cx)
}); });
if cx.has_flag::<Debugger>() { if cx.has_flag::<DebuggerFeatureFlag>() {
for display_row in breakpoint_rows.keys() { for display_row in breakpoint_rows.keys() {
active_rows.entry(*display_row).or_default().breakpoint = true; active_rows.entry(*display_row).or_default().breakpoint = true;
} }
@ -7060,7 +7060,7 @@ impl Element for EditorElement {
// We add the gutter breakpoint indicator to breakpoint_rows after painting // We add the gutter breakpoint indicator to breakpoint_rows after painting
// line numbers so we don't paint a line number debug accent color if a user // line numbers so we don't paint a line number debug accent color if a user
// has their mouse over that line when a breakpoint isn't there // has their mouse over that line when a breakpoint isn't there
if cx.has_flag::<Debugger>() { if cx.has_flag::<DebuggerFeatureFlag>() {
let gutter_breakpoint_indicator = let gutter_breakpoint_indicator =
self.editor.read(cx).gutter_breakpoint_indicator.0; self.editor.read(cx).gutter_breakpoint_indicator.0;
if let Some((gutter_breakpoint_point, _)) = if let Some((gutter_breakpoint_point, _)) =
@ -7576,7 +7576,7 @@ impl Element for EditorElement {
let show_breakpoints = snapshot let show_breakpoints = snapshot
.show_breakpoints .show_breakpoints
.unwrap_or(gutter_settings.breakpoints); .unwrap_or(gutter_settings.breakpoints);
let breakpoints = if cx.has_flag::<Debugger>() && show_breakpoints { let breakpoints = if cx.has_flag::<DebuggerFeatureFlag>() && show_breakpoints {
self.layout_breakpoints( self.layout_breakpoints(
line_height, line_height,
start_row..end_row, start_row..end_row,

20
crates/feature_flags/src/feature_flags.rs
View file

@ -64,18 +64,18 @@ impl FeatureFlag for PredictEditsRateCompletionsFeatureFlag {
const NAME: &'static str = "predict-edits-rate-completions"; const NAME: &'static str = "predict-edits-rate-completions";
} }
pub struct LanguageModels {} pub struct LanguageModelsFeatureFlag {}
impl FeatureFlag for LanguageModels { impl FeatureFlag for LanguageModelsFeatureFlag {
const NAME: &'static str = "language-models"; const NAME: &'static str = "language-models";
} }
pub struct LlmClosedBeta {} pub struct LlmClosedBetaFeatureFlag {}
impl FeatureFlag for LlmClosedBeta { impl FeatureFlag for LlmClosedBetaFeatureFlag {
const NAME: &'static str = "llm-closed-beta"; const NAME: &'static str = "llm-closed-beta";
} }
pub struct ZedPro {} pub struct ZedProFeatureFlag {}
impl FeatureFlag for ZedPro { impl FeatureFlag for ZedProFeatureFlag {
const NAME: &'static str = "zed-pro"; const NAME: &'static str = "zed-pro";
} }
@ -85,13 +85,13 @@ impl FeatureFlag for NotebookFeatureFlag {
const NAME: &'static str = "notebooks"; const NAME: &'static str = "notebooks";
} }
pub struct Debugger {} pub struct DebuggerFeatureFlag {}
impl FeatureFlag for Debugger { impl FeatureFlag for DebuggerFeatureFlag {
const NAME: &'static str = "debugger"; const NAME: &'static str = "debugger";
} }
pub struct ThreadAutoCapture {} pub struct ThreadAutoCaptureFeatureFlag {}
impl FeatureFlag for ThreadAutoCapture { impl FeatureFlag for ThreadAutoCaptureFeatureFlag {
const NAME: &'static str = "thread-auto-capture"; const NAME: &'static str = "thread-auto-capture";
fn enabled_for_staff() -> bool { fn enabled_for_staff() -> bool {

4
crates/language_model_selector/src/language_model_selector.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc; use std::sync::Arc;
use collections::{HashSet, IndexMap}; use collections::{HashSet, IndexMap};
use feature_flags::{Assistant2FeatureFlag, ZedPro}; use feature_flags::{Assistant2FeatureFlag, ZedProFeatureFlag};
use gpui::{ use gpui::{
Action, AnyElement, AnyView, App, Corner, DismissEvent, Entity, EventEmitter, FocusHandle, Action, AnyElement, AnyView, App, Corner, DismissEvent, Entity, EventEmitter, FocusHandle,
Focusable, Subscription, Task, WeakEntity, action_with_deprecated_aliases, Focusable, Subscription, Task, WeakEntity, action_with_deprecated_aliases,
@ -584,7 +584,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
.p_1() .p_1()
.gap_4() .gap_4()
.justify_between() .justify_between()
.when(cx.has_flag::<ZedPro>(), |this| { .when(cx.has_flag::<ZedProFeatureFlag>(), |this| {
this.child(match plan { this.child(match plan {
Plan::ZedPro => Button::new("zed-pro", "Zed Pro") Plan::ZedPro => Button::new("zed-pro", "Zed Pro")
.icon(IconName::ZedAssistant) .icon(IconName::ZedAssistant)

2
crates/language_models/src/language_models.rs
View file

@ -71,7 +71,7 @@ fn register_language_model_providers(
); );
registry.register_provider(CopilotChatLanguageModelProvider::new(cx), cx); registry.register_provider(CopilotChatLanguageModelProvider::new(cx), cx);
cx.observe_flag::<feature_flags::LanguageModels, _>(move |enabled, cx| { cx.observe_flag::<feature_flags::LanguageModelsFeatureFlag, _>(move |enabled, cx| {
let user_store = user_store.clone(); let user_store = user_store.clone();
let client = client.clone(); let client = client.clone();
LanguageModelRegistry::global(cx).update(cx, move |registry, cx| { LanguageModelRegistry::global(cx).update(cx, move |registry, cx| {

6
crates/language_models/src/provider/cloud.rs
View file

@ -2,7 +2,7 @@ use anthropic::{AnthropicError, AnthropicModelMode, parse_prompt_too_long};
use anyhow::{Result, anyhow}; use anyhow::{Result, anyhow};
use client::{Client, UserStore, zed_urls}; use client::{Client, UserStore, zed_urls};
use collections::BTreeMap; use collections::BTreeMap;
use feature_flags::{FeatureFlagAppExt, LlmClosedBeta, ZedPro}; use feature_flags::{FeatureFlagAppExt, LlmClosedBetaFeatureFlag, ZedProFeatureFlag};
use futures::{ use futures::{
AsyncBufReadExt, FutureExt, Stream, StreamExt, TryStreamExt as _, future::BoxFuture, AsyncBufReadExt, FutureExt, Stream, StreamExt, TryStreamExt as _, future::BoxFuture,
stream::BoxStream, stream::BoxStream,
@ -324,7 +324,7 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
); );
} }
let llm_closed_beta_models = if cx.has_flag::<LlmClosedBeta>() { let llm_closed_beta_models = if cx.has_flag::<LlmClosedBetaFeatureFlag>() {
zed_cloud_provider_additional_models() zed_cloud_provider_additional_models()
} else { } else {
&[] &[]
@ -945,7 +945,7 @@ impl Render for ConfigurationView {
), ),
), ),
) )
} else if cx.has_flag::<ZedPro>() { } else if cx.has_flag::<ZedProFeatureFlag>() {
Some( Some(
h_flex() h_flex()
.gap_2() .gap_2()

4
crates/title_bar/src/title_bar.rs
View file

@ -18,7 +18,7 @@ use crate::platforms::{platform_linux, platform_mac, platform_windows};
use auto_update::AutoUpdateStatus; use auto_update::AutoUpdateStatus;
use call::ActiveCall; use call::ActiveCall;
use client::{Client, UserStore}; use client::{Client, UserStore};
use feature_flags::{FeatureFlagAppExt, ZedPro}; use feature_flags::{FeatureFlagAppExt, ZedProFeatureFlag};
use gpui::{ use gpui::{
Action, AnyElement, App, Context, Corner, Decorations, Element, Entity, InteractiveElement, Action, AnyElement, App, Context, Corner, Decorations, Element, Entity, InteractiveElement,
Interactivity, IntoElement, MouseButton, ParentElement, Render, Stateful, Interactivity, IntoElement, MouseButton, ParentElement, Render, Stateful,
@ -663,7 +663,7 @@ impl TitleBar {
.anchor(Corner::TopRight) .anchor(Corner::TopRight)
.menu(move |window, cx| { .menu(move |window, cx| {
ContextMenu::build(window, cx, |menu, _, cx| { ContextMenu::build(window, cx, |menu, _, cx| {
menu.when(cx.has_flag::<ZedPro>(), |menu| { menu.when(cx.has_flag::<ZedProFeatureFlag>(), |menu| {
menu.action( menu.action(
format!( format!(
"Current Plan: {}", "Current Plan: {}",

6
crates/zed/src/zed.rs
View file

@ -20,7 +20,7 @@ use command_palette_hooks::CommandPaletteFilter;
use debugger_ui::debugger_panel::DebugPanel; use debugger_ui::debugger_panel::DebugPanel;
use editor::ProposedChangesEditorToolbar; use editor::ProposedChangesEditorToolbar;
use editor::{Editor, MultiBuffer, scroll::Autoscroll}; use editor::{Editor, MultiBuffer, scroll::Autoscroll};
use feature_flags::{Debugger, FeatureFlagAppExt, FeatureFlagViewExt}; use feature_flags::{DebuggerFeatureFlag, FeatureFlagAppExt, FeatureFlagViewExt};
use futures::{StreamExt, channel::mpsc, select_biased}; use futures::{StreamExt, channel::mpsc, select_biased};
use git_ui::git_panel::GitPanel; use git_ui::git_panel::GitPanel;
use git_ui::project_diff::ProjectDiffToolbar; use git_ui::project_diff::ProjectDiffToolbar;
@ -279,7 +279,7 @@ fn feature_gate_zed_pro_actions(cx: &mut App) {
filter.hide_action_types(&zed_pro_actions); filter.hide_action_types(&zed_pro_actions);
}); });
cx.observe_flag::<feature_flags::ZedPro, _>({ cx.observe_flag::<feature_flags::ZedProFeatureFlag, _>({
move |is_enabled, cx| { move |is_enabled, cx| {
CommandPaletteFilter::update_global(cx, |filter, _cx| { CommandPaletteFilter::update_global(cx, |filter, _cx| {
if is_enabled { if is_enabled {
@ -439,7 +439,7 @@ fn initialize_panels(
workspace.add_panel(channels_panel, window, cx); workspace.add_panel(channels_panel, window, cx);
workspace.add_panel(chat_panel, window, cx); workspace.add_panel(chat_panel, window, cx);
workspace.add_panel(notification_panel, window, cx); workspace.add_panel(notification_panel, window, cx);
cx.when_flag_enabled::<Debugger>(window, |_, window, cx| { cx.when_flag_enabled::<DebuggerFeatureFlag>(window, |_, window, cx| {
cx.spawn_in( cx.spawn_in(
window, window,
async move |workspace: gpui::WeakEntity<Workspace>, async move |workspace: gpui::WeakEntity<Workspace>,