From 6f0951ff772bb08928326a49ae156fcabe14ed8f Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 15 Apr 2025 10:59:42 -0400 Subject: [PATCH] debugger_ui: Move `DEBUGGER_PANEL_PREFIX` out of `db` (#28768) This PR moves the `DEBUGGER_PANEL_PREFIX` constant out of the `db` crate and into `debugger_ui`, since it is specific to that. Release Notes: - N/A --- crates/db/src/kvp.rs | 1 - crates/debugger_ui/src/persistence.rs | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/crates/db/src/kvp.rs b/crates/db/src/kvp.rs index d501368c85..c9d994d34d 100644 --- a/crates/db/src/kvp.rs +++ b/crates/db/src/kvp.rs @@ -1,7 +1,6 @@ use sqlez_macros::sql; use crate::{define_connection, query}; -pub static DEBUGGER_PANEL_PREFIX: &str = "debugger_panel_"; define_connection!(pub static ref KEY_VALUE_STORE: KeyValueStore<()> = &[sql!( diff --git a/crates/debugger_ui/src/persistence.rs b/crates/debugger_ui/src/persistence.rs index 0472675268..f77a723adf 100644 --- a/crates/debugger_ui/src/persistence.rs +++ b/crates/debugger_ui/src/persistence.rs @@ -52,6 +52,8 @@ pub(crate) struct SerializedPane { pub active_item: Option, } +const DEBUGGER_PANEL_PREFIX: &str = "debugger_panel_"; + pub(crate) async fn serialize_pane_layout( adapter_name: SharedString, pane_group: SerializedPaneLayout, @@ -59,7 +61,7 @@ pub(crate) async fn serialize_pane_layout( if let Ok(serialized_pane_group) = serde_json::to_string(&pane_group) { KEY_VALUE_STORE .write_kvp( - format!("{}-{adapter_name}", db::kvp::DEBUGGER_PANEL_PREFIX), + format!("{DEBUGGER_PANEL_PREFIX}-{adapter_name}"), serialized_pane_group, ) .await @@ -116,11 +118,7 @@ fn serialize_pane(pane: &Entity, cx: &mut App) -> SerializedPane { pub(crate) async fn get_serialized_pane_layout( adapter_name: impl AsRef, ) -> Option { - let key = format!( - "{}-{}", - db::kvp::DEBUGGER_PANEL_PREFIX, - adapter_name.as_ref() - ); + let key = format!("{DEBUGGER_PANEL_PREFIX}-{}", adapter_name.as_ref()); KEY_VALUE_STORE .read_kvp(&key)