feat(commands): allows cycling option values at runtime (#4411)

pull/7240/head
Alex Vinyals 1 year ago committed by GitHub
parent 2022e6175b
commit d5707a4696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -8,7 +8,6 @@ use super::*;
use helix_core::{encoding, shellwords::Shellwords}; use helix_core::{encoding, shellwords::Shellwords};
use helix_view::document::DEFAULT_LANGUAGE_NAME; use helix_view::document::DEFAULT_LANGUAGE_NAME;
use helix_view::editor::{Action, CloseError, ConfigEvent}; use helix_view::editor::{Action, CloseError, ConfigEvent};
use serde_json::Value;
use ui::completers::{self, Completer}; use ui::completers::{self, Completer};
#[derive(Clone)] #[derive(Clone)]
@ -1790,8 +1789,8 @@ fn toggle_option(
return Ok(()); return Ok(());
} }
if args.len() != 1 { if args.is_empty() {
anyhow::bail!("Bad arguments. Usage: `:toggle key`"); anyhow::bail!("Bad arguments. Usage: `:toggle key [values]?`");
} }
let key = &args[0].to_lowercase(); let key = &args[0].to_lowercase();
@ -1801,22 +1800,48 @@ fn toggle_option(
let pointer = format!("/{}", key.replace('.', "/")); let pointer = format!("/{}", key.replace('.', "/"));
let value = config.pointer_mut(&pointer).ok_or_else(key_error)?; let value = config.pointer_mut(&pointer).ok_or_else(key_error)?;
let Value::Bool(old_value) = *value else { *value = match value.as_bool() {
anyhow::bail!("Key `{}` is not toggle-able", key) Some(value) => {
ensure!(
args.len() == 1,
"Bad arguments. For boolean configurations use: `:toggle key`"
);
serde_json::Value::Bool(!value)
}
None => {
ensure!(
args.len() > 2,
"Bad arguments. For non-boolean configurations use: `:toggle key val1 val2 ...`",
);
ensure!(
value.is_string(),
"Bad configuration. Cannot cycle non-string configurations"
);
let value = value
.as_str()
.expect("programming error: should have been ensured before");
serde_json::Value::String(
args[1..]
.iter()
.skip_while(|e| *e != value)
.nth(1)
.unwrap_or_else(|| &args[1])
.to_string(),
)
}
}; };
let new_value = !old_value; let status = format!("'{key}' is now set to {value}");
*value = Value::Bool(new_value); let config = serde_json::from_value(config)
// This unwrap should never fail because we only replace one boolean value .map_err(|_| anyhow::anyhow!("Could not parse field: `{:?}`", &args))?;
// with another, maintaining a valid json config
let config = serde_json::from_value(config).unwrap();
cx.editor cx.editor
.config_events .config_events
.0 .0
.send(ConfigEvent::Update(config))?; .send(ConfigEvent::Update(config))?;
cx.editor cx.editor.set_status(status);
.set_status(format!("Option `{}` is now set to `{}`", key, new_value));
Ok(()) Ok(())
} }

Loading…
Cancel
Save