48eb0d4 · helix · git.iko.soy

on master help sign in

Enhance :toggle to support cycling numbers (#7877)

48eb0d4Alex Vinyals3 years ago

helix-term/src/commands/typed.rs+17−2

@@ -1856,14 +1856,29 @@ fn toggle_option(

1856 .to_string(),

1857 )

1858 }

1859+ Value::Number(ref value) => {

1860+ ensure!(

1861+ args.len() > 2,

1862+ "Bad arguments. For number configurations use: `:toggle key val1 val2 ...`",

1863+ );

1864+

1865+ Value::Number(

1866+ args[1..]

1867+ .iter()

1868+ .skip_while(|&e| value.to_string() != *e.to_string())

1869+ .nth(1)

1870+ .unwrap_or_else(|| &args[1])

1871+ .parse()?,

1872+ )

1873+ }

1859− Value::Null | Value::Object(_) | Value::Array(_) | Value::Number(_) => {

1874+ Value::Null | Value::Object(_) | Value::Array(_) => {

1860 anyhow::bail!("Configuration {key} does not support toggle yet")

1875 anyhow::bail!("Configuration {key} does not support toggle yet")

1861 }

1876 }

1862 };

1877 };

1863

1878

1864 let status = format!("'{key}' is now set to {value}");

1879 let status = format!("'{key}' is now set to {value}");

1865 let config = serde_json::from_value(config)

1880 let config = serde_json::from_value(config)

1866− .map_err(|_| anyhow::anyhow!("Could not parse field: `{:?}`", &args))?;

1881+ .map_err(|err| anyhow::anyhow!("Cannot parse `{:?}`, {}", &args, err))?;

1867

1882

1868 cx.editor

1883 cx.editor

1869 .config_events

1884 .config_events