Misc code cleanups accumulated while working on other changes (#34787)

Michael Sloan created 4 months ago

Release Notes:

- N/A

Change summary

crates/command_palette/src/command_palette.rs         |  2 
crates/dap/src/registry.rs                            |  1 
crates/gpui/examples/set_menus.rs                     |  2 
crates/gpui/src/app.rs                                |  4 ++
crates/migrator/src/migrations/m_2025_04_15/keymap.rs |  2 
crates/theme/src/schema.rs                            | 18 +-----------
crates/util/src/schemars.rs                           |  1 
7 files changed, 9 insertions(+), 21 deletions(-)

Detailed changes

crates/command_palette/src/command_palette.rs

@@ -242,7 +242,7 @@ impl CommandPaletteDelegate {
             self.selected_ix = cmp::min(self.selected_ix, self.matches.len() - 1);
         }
     }
-    ///
+
     /// Hit count for each command in the palette.
     /// We only account for commands triggered directly via command palette and not by e.g. keystrokes because
     /// if a user already knows a keystroke for a command, they are unlikely to use a command palette to look for it.

crates/dap/src/registry.rs

@@ -46,6 +46,7 @@ impl DapRegistry {
         let name = adapter.name();
         let _previous_value = self.0.write().adapters.insert(name, adapter);
     }
+
     pub fn add_locator(&self, locator: Arc<dyn DapLocator>) {
         self.0.write().locators.insert(locator.name(), locator);
     }

crates/gpui/examples/set_menus.rs

@@ -34,7 +34,7 @@ fn main() {
     });
 }
 
-// Associate actions using the `actions!` macro (or `impl_actions!` macro)
+// Associate actions using the `actions!` macro (or `Action` derive macro)
 actions!(set_menus, [Quit]);
 
 // Define the quit function that is registered with the App

crates/gpui/src/app.rs

@@ -1370,7 +1370,9 @@ impl App {
         self.keymap.clone()
     }
 
-    /// Register a global listener for actions invoked via the keyboard.
+    /// Register a global handler for actions invoked via the keyboard. These handlers are run at
+    /// the end of the bubble phase for actions, and so will only be invoked if there are no other
+    /// handlers or if they called `cx.propagate()`.
     pub fn on_action<A: Action>(&mut self, listener: impl Fn(&A, &mut Self) + 'static) {
         self.global_action_listeners
             .entry(TypeId::of::<A>())

crates/migrator/src/migrations/m_2025_04_15/keymap.rs

@@ -25,7 +25,7 @@ fn replace_string_action(
     None
 }
 
-/// "ctrl-k ctrl-1": "inline_completion::ToggleMenu" -> "edit_prediction::ToggleMenu"
+/// "space": "outline_panel::Open" -> "outline_panel::OpenSelectedEntry"
 static STRING_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
     HashMap::from_iter([("outline_panel::Open", "outline_panel::OpenSelectedEntry")])
 });

crates/theme/src/schema.rs

@@ -4,11 +4,10 @@ use anyhow::Result;
 use gpui::{FontStyle, FontWeight, HighlightStyle, Hsla, WindowBackgroundAppearance};
 use indexmap::IndexMap;
 use palette::FromColor;
-use schemars::{JsonSchema, json_schema};
+use schemars::{JsonSchema, JsonSchema_repr};
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::Value;
 use serde_repr::{Deserialize_repr, Serialize_repr};
-use std::borrow::Cow;
 
 use crate::{StatusColorsRefinement, ThemeColorsRefinement};
 
@@ -1486,7 +1485,7 @@ impl From<FontStyleContent> for FontStyle {
     }
 }
 
-#[derive(Debug, Clone, Copy, Serialize_repr, Deserialize_repr, PartialEq)]
+#[derive(Debug, Clone, Copy, Serialize_repr, Deserialize_repr, JsonSchema_repr, PartialEq)]
 #[repr(u16)]
 pub enum FontWeightContent {
     Thin = 100,
@@ -1500,19 +1499,6 @@ pub enum FontWeightContent {
     Black = 900,
 }
 
-impl JsonSchema for FontWeightContent {
-    fn schema_name() -> Cow<'static, str> {
-        "FontWeightContent".into()
-    }
-
-    fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        json_schema!({
-            "type": "integer",
-            "enum": [100, 200, 300, 400, 500, 600, 700, 800, 900]
-        })
-    }
-}
-
 impl From<FontWeightContent> for FontWeight {
     fn from(value: FontWeightContent) -> Self {
         match value {

crates/util/src/schemars.rs

@@ -15,7 +15,6 @@ pub fn replace_subschema<T: JsonSchema>(
     generator: &mut schemars::SchemaGenerator,
     schema: impl Fn() -> schemars::Schema,
 ) -> schemars::Schema {
-    // fallback on just using the schema name, which could collide.
     let schema_name = T::schema_name();
     let definitions = generator.definitions_mut();
     assert!(!definitions.contains_key(&format!("{schema_name}2")));