Skip to content

Commit

Permalink
Put zed: open account settings action behind a feature flag (zed-in…
Browse files Browse the repository at this point in the history
…dustries#17014)

This PR puts the `zed: open account settings` action behind the
`zed-pro` feature flag, as it isn't supposed to be visible to users yet.

Closes zed-industries#17010.

Release Notes:

- N/A
  • Loading branch information
maxdeviant authored Aug 28, 2024
1 parent 324964d commit c988ff8
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion crates/zed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,18 @@ client.workspace = true
collab_ui.workspace = true
collections.workspace = true
command_palette.workspace = true
command_palette_hooks.workspace = true
copilot.workspace = true
db.workspace = true
diagnostics.workspace = true
editor.workspace = true
env_logger.workspace = true
extension.workspace = true
extensions_ui.workspace = true
feature_flags.workspace = true
feedback.workspace = true
file_icons.workspace = true
file_finder.workspace = true
file_icons.workspace = true
fs.workspace = true
futures.workspace = true
git.workspace = true
Expand Down
26 changes: 26 additions & 0 deletions crates/zed/src/zed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ use assistant::PromptBuilder;
use breadcrumbs::Breadcrumbs;
use client::ZED_URL_SCHEME;
use collections::VecDeque;
use command_palette_hooks::CommandPaletteFilter;
use editor::{scroll::Autoscroll, Editor, MultiBuffer};
use feature_flags::FeatureFlagAppExt;
use gpui::{
actions, point, px, AppContext, AsyncAppContext, Context, FocusableView, MenuItem, PromptLevel,
ReadGlobal, TitlebarOptions, View, ViewContext, VisualContext, WindowKind, WindowOptions,
Expand All @@ -32,6 +34,7 @@ use settings::{
initial_local_settings_content, initial_tasks_content, watch_config_file, KeymapFile, Settings,
SettingsStore, DEFAULT_KEYMAP_PATH,
};
use std::any::TypeId;
use std::{borrow::Cow, ops::Deref, path::Path, sync::Arc};
use task::static_source::{StaticSource, TrackedFile};
use theme::ActiveTheme;
Expand Down Expand Up @@ -541,6 +544,29 @@ pub fn initialize_workspace(
workspace.focus_handle(cx).focus(cx);
})
.detach();

feature_gate_zed_pro_actions(cx);
}

fn feature_gate_zed_pro_actions(cx: &mut AppContext) {
let zed_pro_actions = [TypeId::of::<OpenAccountSettings>()];

CommandPaletteFilter::update_global(cx, |filter, _cx| {
filter.hide_action_types(&zed_pro_actions);
});

cx.observe_flag::<feature_flags::ZedPro, _>({
move |is_enabled, cx| {
CommandPaletteFilter::update_global(cx, |filter, _cx| {
if is_enabled {
filter.show_action_types(zed_pro_actions.iter());
} else {
filter.hide_action_types(&zed_pro_actions);
}
});
}
})
.detach();
}

fn initialize_pane(workspace: &mut Workspace, pane: &View<Pane>, cx: &mut ViewContext<Workspace>) {
Expand Down

0 comments on commit c988ff8

Please sign in to comment.