mirror of https://github.com/helix-editor/helix
Merge pull request #13 from merisbahti/meris.fix-get-option-value
get_option_value: fix argumentpull/8675/merge^2
commit
fb91ecefb9
|
@ -509,16 +509,11 @@ fn load_typed_commands(engine: &mut Engine, generate_sources: bool) {
|
||||||
engine.register_module(module);
|
engine.register_module(module);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_option_value(cx: &mut Context, args: Vec<String>) -> anyhow::Result<SteelVal> {
|
fn get_option_value(cx: &mut Context, option: String) -> anyhow::Result<SteelVal> {
|
||||||
if args.len() != 1 {
|
let key_error = || anyhow::anyhow!("Unknown key `{}`", option);
|
||||||
anyhow::bail!("Bad arguments. Usage: `:get key`");
|
|
||||||
}
|
|
||||||
|
|
||||||
let key = &args[0].to_lowercase();
|
|
||||||
let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
|
|
||||||
|
|
||||||
let config = serde_json::json!(std::ops::Deref::deref(&cx.editor.config()));
|
let config = serde_json::json!(std::ops::Deref::deref(&cx.editor.config()));
|
||||||
let pointer = format!("/{}", key.replace('.', "/"));
|
let pointer = format!("/{}", option.replace('.', "/"));
|
||||||
let value = config.pointer(&pointer).ok_or_else(key_error)?;
|
let value = config.pointer(&pointer).ok_or_else(key_error)?;
|
||||||
Ok(value.to_owned().into_steelval().unwrap())
|
Ok(value.to_owned().into_steelval().unwrap())
|
||||||
}
|
}
|
||||||
|
@ -713,7 +708,7 @@ fn load_configuration_api(engine: &mut Engine, generate_sources: bool) {
|
||||||
r#"
|
r#"
|
||||||
(provide get-config-option-value)
|
(provide get-config-option-value)
|
||||||
(define (get-config-option-value arg)
|
(define (get-config-option-value arg)
|
||||||
(helix.get-config-option-value *helix.cx*))
|
(helix.get-config-option-value *helix.cx* arg))
|
||||||
"#,
|
"#,
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue