diff --git a/crates/extension_host/src/extension_settings.rs b/crates/extension_host/src/extension_settings.rs index f1c23877c0e48945958dc56de14a21a0e2533404..a4af4a1ba3030b54bf14d2b64d8eef3646ae29bf 100644 --- a/crates/extension_host/src/extension_settings.rs +++ b/crates/extension_host/src/extension_settings.rs @@ -48,21 +48,15 @@ impl Settings for ExtensionSettings { .unwrap_or_default() .into_iter() .map(|capability| match capability { - settings::ExtensionCapabilityContent::ProcessExec(capability) => { - ExtensionCapability::ProcessExec(ProcessExecCapability { - command: capability.command, - args: capability.args, - }) + settings::ExtensionCapabilityContent::ProcessExec { command, args } => { + ExtensionCapability::ProcessExec(ProcessExecCapability { command, args }) } - settings::ExtensionCapabilityContent::DownloadFile(capability) => { - ExtensionCapability::DownloadFile(DownloadFileCapability { - host: capability.host, - path: capability.path, - }) + settings::ExtensionCapabilityContent::DownloadFile { host, path } => { + ExtensionCapability::DownloadFile(DownloadFileCapability { host, path }) } - settings::ExtensionCapabilityContent::NpmInstallPackage(capability) => { + settings::ExtensionCapabilityContent::NpmInstallPackage { package } => { ExtensionCapability::NpmInstallPackage(NpmInstallPackageCapability { - package: capability.package, + package, }) } }) diff --git a/crates/settings/src/settings_content/extension.rs b/crates/settings/src/settings_content/extension.rs index 1b5ce12a832e710b0be6cd6a5ee9cb97b95eeab9..f8abb5283ff02365efe5f8cd919757c0e0c4565a 100644 --- a/crates/settings/src/settings_content/extension.rs +++ b/crates/settings/src/settings_content/extension.rs @@ -29,31 +29,19 @@ pub struct ExtensionSettingsContent { #[serde(tag = "kind", rename_all = "snake_case")] pub enum ExtensionCapabilityContent { #[serde(rename = "process:exec")] - ProcessExec(ProcessExecCapabilityContent), - DownloadFile(DownloadFileCapabilityContent), + ProcessExec { + /// The command to execute. + command: String, + /// The arguments to pass to the command. Use `*` for a single wildcard argument. + /// If the last element is `**`, then any trailing arguments are allowed. + args: Vec, + }, + DownloadFile { + host: String, + path: Vec, + }, #[serde(rename = "npm:install")] - NpmInstallPackage(NpmInstallPackageCapabilityContent), -} - -#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] -pub struct ProcessExecCapabilityContent { - /// The command to execute. - pub command: String, - /// The arguments to pass to the command. Use `*` for a single wildcard argument. - /// If the last element is `**`, then any trailing arguments are allowed. - pub args: Vec, -} - -#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] -pub struct DownloadFileCapabilityContent { - pub host: String, - pub path: Vec, -} - -#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] -pub struct NpmInstallPackageCapabilityContent { - pub package: String, + NpmInstallPackage { + package: String, + }, }