Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Implement `inspector` flag (#62920)
Chris Biscardi91bf967e279f
diff --git a/crates/inspector_ui/Cargo.toml b/crates/inspector_ui/Cargo.tomlindex ec1f01195c8..892f93d9b5f 100644--- a/crates/inspector_ui/Cargo.toml+++ b/crates/inspector_ui/Cargo.toml@@ -11,6 +11,9 @@ workspace = true[lib]path = "src/inspector_ui.rs"+[features]+inspector = []+[dependencies]anyhow.workspace = truecommand_palette_hooks.workspace = truediff --git a/crates/inspector_ui/src/inspector_ui.rs b/crates/inspector_ui/src/inspector_ui.rsindex 13420070055..d608ea76cad 100644--- a/crates/inspector_ui/src/inspector_ui.rs+++ b/crates/inspector_ui/src/inspector_ui.rs@@ -1,19 +1,19 @@-#[cfg(debug_assertions)]+#[cfg(any(debug_assertions, feature = "inspector"))]mod div_inspector;-#[cfg(debug_assertions)]+#[cfg(any(debug_assertions, feature = "inspector"))]mod inspector;-#[cfg(debug_assertions)]+#[cfg(any(debug_assertions, feature = "inspector"))]pub use inspector::init;-#[cfg(not(debug_assertions))]+#[cfg(not(any(debug_assertions, feature = "inspector")))]pub fn init(_app_state: std::sync::Arc<workspace::AppState>, cx: &mut gpui::App) {use std::any::TypeId;use workspace::notifications::NotifyResultExt as _;cx.on_action(|_: &zed_actions::dev::ToggleInspector, cx| {Err::<(), anyhow::Error>(anyhow::anyhow!(- "dev::ToggleInspector is only available in debug builds"+ "dev::ToggleInspector is only available in debug builds and Nightly")).notify_app_err(cx);});diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.tomlindex 7ff2cfa3712..6b2ed189aa4 100644--- a/crates/ui/Cargo.toml+++ b/crates/ui/Cargo.toml@@ -42,3 +42,4 @@ ignored = ["log"][features]default = []+derive_inspector_reflection = []diff --git a/crates/ui/src/traits/styled_ext.rs b/crates/ui/src/traits/styled_ext.rsindex 849e56a024a..c509595362c 100644--- a/crates/ui/src/traits/styled_ext.rs+++ b/crates/ui/src/traits/styled_ext.rs@@ -20,7 +20,10 @@ fn elevated_borderless<E: Styled>(this: E, cx: &mut App, index: ElevationIndex)/// Extends [`gpui::Styled`] with Zed-specific styling methods.// gate on rust-analyzer so rust-analyzer never needs to expand this macro, it takes up to 10 seconds to expand due to inefficiencies in rust-analyzers proc-macro srv#[cfg_attr(- all(debug_assertions, not(rust_analyzer)),+ all(+ any(debug_assertions, feature = "derive_inspector_reflection"),+ not(rust_analyzer)+ ),gpui_macros::derive_inspector_reflection)]pub trait StyledExt: Styled + Sized {diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.tomlindex 8409911f6d3..f8675c37615 100644--- a/crates/zed/Cargo.toml+++ b/crates/zed/Cargo.toml@@ -12,6 +12,11 @@ default-run = "zed"workspace = true[features]+inspector = [+ "gpui/inspector",+ "inspector_ui/inspector",+ "ui/derive_inspector_reflection",+]tracy = ["ztracing/tracy"]# LEAK_BACKTRACE=1 cargo run --features zed/track-project-leak --profile release-fasttrack-project-leak = ["gpui/leak-detection"]@@ -116,11 +121,16 @@ fs.workspace = truefutures.workspace = truegit.workspace = truegit_hosting_providers.workspace = true-git_ui = { workspace = true, features = [ "call" ] }+git_ui = { workspace = true, features = ["call"] }git_ui_core.workspace = truego_to_line.workspace = true-gpui = { workspace = true, features = [ "profiler" ] }-gpui_platform = { workspace = true, features = [ "screen-capture", "font-kit", "wayland", "x11" ] }+gpui = { workspace = true, features = ["profiler"] }+gpui_platform = { workspace = true, features = [+ "screen-capture",+ "font-kit",+ "wayland",+ "x11",+] }gpui_tokio.workspace = trueimage = { workspace = true, optional = true }spin = "0.10.0"@@ -231,20 +241,13 @@ ztracing.workspace = true[target.'cfg(target_os = "windows")'.dependencies]etw_tracing.workspace = truewindows.workspace = true-gpui = { workspace = true, features = [- "profiler",- "windows-manifest",-] }+gpui = { workspace = true, features = ["profiler", "windows-manifest"] }[build-dependencies]windows_resources = { path = "../windows_resources" }[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]-gpui = { workspace = true, features = [- "profiler",- "wayland",- "x11",-] }+gpui = { workspace = true, features = ["profiler", "wayland", "x11"] }ashpd.workspace = trueimage.workspace = true@@ -278,7 +281,6 @@ search = { workspace = true, features = ["test-support"] }repl = { workspace = true, features = ["test-support"] }-[package.metadata.bundle-dev]icon = ["resources/[email protected]", "resources/app-icon-dev.png"]identifier = "dev.zed.Zed-Dev"