Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

settings_content: Make context server args optional (#59623)

Ibrahim Khanca2d7fd9e5c1
diff --git a/crates/settings_content/src/project.rs b/crates/settings_content/src/project.rs
index 3d64cda282e..6e62f56ddf3 100644
--- a/crates/settings_content/src/project.rs
+++ b/crates/settings_content/src/project.rs
@@ -481,6 +481,7 @@ pub struct OAuthClientSettings {
pub struct ContextServerCommand {
#[serde(rename = "command")]
pub path: PathBuf,
+ #[serde(default)]
pub args: Vec<String>,
pub env: Option<HashMap<String, String>>,
/// Timeout for tool calls in seconds. Defaults to 60 if not specified.
@@ -847,3 +848,27 @@ pub enum GitHostingProviderKind {
Forgejo,
SourceHut,
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_stdio_context_server_without_args() {
+ let settings: ContextServerSettingsContent =
+ serde_json::from_str(r#"{ "command": "echo" }"#)
+ .expect("stdio context server without `args` should parse");
+ let ContextServerSettingsContent::Stdio { command, .. } = settings else {
+ panic!("expected Stdio variant, got {settings:?}");
+ };
+ assert_eq!(command.path, PathBuf::from("echo"));
+ assert!(command.args.is_empty());
+
+ let settings: ContextServerSettingsContent =
+ serde_json::from_str(r#"{ "command": "echo", "args": ["hello"] }"#).unwrap();
+ let ContextServerSettingsContent::Stdio { command, .. } = settings else {
+ panic!("expected Stdio variant, got {settings:?}");
+ };
+ assert_eq!(command.args, vec!["hello".to_string()]);
+ }
+}