vim_mode_setting -> editor_mode_setting

Author: smitbarmase

Cargo.lock

@@ -180,7 +180,7 @@ members = [
     "crates/util_macros",
     "crates/vercel",
     "crates/vim",
-    "crates/vim_mode_setting",
+    "crates/editor_mode_setting",
     "crates/watch",
     "crates/web_search",
     "crates/web_search_providers",
@@ -404,7 +404,7 @@ util = { path = "crates/util" }
 util_macros = { path = "crates/util_macros" }
 vercel = { path = "crates/vercel" }
 vim = { path = "crates/vim" }
-vim_mode_setting = { path = "crates/vim_mode_setting" }
+editor_mode_setting = { path = "crates/editor_mode_setting" }
 
 watch = { path = "crates/watch" }
 web_search = { path = "crates/web_search" }

Cargo.toml

@@ -22,7 +22,7 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 workspace-hack.workspace = true
-vim_mode_setting.workspace = true
+editor_mode_setting.workspace = true
 
 [dev-dependencies]
 fs.workspace = true

crates/agent_settings/Cargo.toml

@@ -4,13 +4,13 @@ use std::sync::Arc;
 
 use anyhow::{Result, bail};
 use collections::IndexMap;
+use editor_mode_setting::EditorMode;
 use gpui::{App, Pixels, SharedString};
 use language_model::LanguageModel;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use settings::{Settings, SettingsSources};
 use std::borrow::Cow;
-use vim_mode_setting::EditorMode;
 
 pub use crate::agent_profile::*;
 
@@ -62,12 +62,10 @@ impl<'de> Deserialize<'de> for AgentEditorMode {
         D: Deserializer<'de>,
     {
         let s = String::deserialize(deserializer)?;
-        dbg!(&s);
         if s == "inherit" {
             Ok(AgentEditorMode::Inherit)
         } else {
             let mode = EditorMode::deserialize(serde::de::value::StringDeserializer::new(s))?;
-            dbg!(&mode);
             Ok(AgentEditorMode::EditorModeOverride(mode))
         }
     }
@@ -91,7 +89,7 @@ impl JsonSchema for AgentEditorMode {
     }
 
     fn json_schema(_gen: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        use vim_mode_setting::EditorMode;
+        use editor_mode_setting::EditorMode;
 
         let mut options = vec![serde_json::json!({
             "const": "inherit",

crates/agent_settings/src/agent_settings.rs

@@ -100,7 +100,7 @@ watch.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-vim_mode_setting.workspace = true
+editor_mode_setting.workspace = true
 
 [dev-dependencies]
 acp_thread = { workspace = true, features = ["test-support"] }

crates/agent_ui/Cargo.toml

@@ -115,10 +115,9 @@ impl MessageEditor {
         let mention_set = MentionSet::default();
 
         let settings = AgentSettings::get_global(cx);
-        dbg!(&settings);
         let editor_mode = match settings.editor_mode {
             AgentEditorMode::EditorModeOverride(mode) => mode,
-            AgentEditorMode::Inherit => vim_mode_setting::EditorModeSetting::get_global(cx).0,
+            AgentEditorMode::Inherit => editor_mode_setting::EditorModeSetting::get_global(cx).0,
         };
 
         let editor = cx.new(|cx| {
@@ -129,8 +128,6 @@ impl MessageEditor {
             editor.set_placeholder_text(placeholder, cx);
             editor.set_show_indent_guides(false, cx);
             editor.set_soft_wrap();
-            println!("editor mode in agent acp");
-            dbg!(&editor_mode);
             editor.set_editor_mode(editor_mode, cx);
             editor.set_completion_provider(Some(Rc::new(completion_provider)));
             editor.set_context_menu_options(ContextMenuOptions {
@@ -171,7 +168,9 @@ impl MessageEditor {
             let settings = AgentSettings::get_global(cx);
             let editor_mode = match settings.editor_mode {
                 AgentEditorMode::EditorModeOverride(mode) => mode,
-                AgentEditorMode::Inherit => vim_mode_setting::EditorModeSetting::get_global(cx).0,
+                AgentEditorMode::Inherit => {
+                    editor_mode_setting::EditorModeSetting::get_global(cx).0
+                }
             };
             this.editor.update(cx, |editor, cx| {
                 editor.set_editor_mode(editor_mode, cx);

crates/agent_ui/src/acp/message_editor.rs

@@ -119,7 +119,7 @@ pub(crate) fn create_editor(
         let editor_mode = match settings.editor_mode {
             agent_settings::AgentEditorMode::EditorModeOverride(mode) => mode,
             agent_settings::AgentEditorMode::Inherit => {
-                vim_mode_setting::EditorModeSetting::get_global(cx).0
+                editor_mode_setting::EditorModeSetting::get_global(cx).0
             }
         };
 
@@ -136,8 +136,6 @@ pub(crate) fn create_editor(
         editor.set_placeholder_text("Message the agent – @ to include context", cx);
         editor.set_show_indent_guides(false, cx);
         editor.set_soft_wrap();
-        println!("editor mode in agent");
-        dbg!(&editor_mode);
         editor.set_editor_mode(editor_mode, cx);
         editor.set_context_menu_options(ContextMenuOptions {
             min_entries_visible: 12,
@@ -243,7 +241,7 @@ impl MessageEditor {
                 let editor_mode = match settings.editor_mode {
                     agent_settings::AgentEditorMode::EditorModeOverride(mode) => mode,
                     agent_settings::AgentEditorMode::Inherit => {
-                        vim_mode_setting::EditorModeSetting::get_global(cx).0
+                        editor_mode_setting::EditorModeSetting::get_global(cx).0
                     }
                 };
                 this.editor.update(cx, |editor, cx| {

crates/agent_ui/src/message_editor.rs

@@ -76,7 +76,7 @@ util.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-vim_mode_setting.workspace = true
+editor_mode_setting.workspace = true
 
 [dev-dependencies]
 dap = { workspace = true, features = ["test-support"] }

crates/debugger_ui/Cargo.toml

@@ -7,6 +7,7 @@ use anyhow::Result;
 use collections::HashMap;
 use dap::{CompletionItem, CompletionItemType, OutputEvent};
 use editor::{Bias, CompletionProvider, Editor, EditorElement, EditorStyle, ExcerptId};
+use editor_mode_setting::EditorMode;
 use fuzzy::StringMatchCandidate;
 use gpui::{
     Action as _, AppContext, Context, Corner, Entity, FocusHandle, Focusable, HighlightStyle, Hsla,
@@ -26,7 +27,6 @@ use std::{cell::RefCell, ops::Range, rc::Rc, usize};
 use theme::{Theme, ThemeSettings};
 use ui::{ContextMenu, Divider, PopoverMenu, SplitButton, Tooltip, prelude::*};
 use util::ResultExt;
-use vim_mode_setting::EditorMode;
 
 actions!(
     console,

crates/debugger_ui/src/session/running/console.rs

@@ -92,7 +92,7 @@ uuid.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
 workspace-hack.workspace = true
-vim_mode_setting.workspace = true
+editor_mode_setting.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true