sxyazi/yazi
1
1
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2024-12-21 15:51:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not default to passing self to setup to respect user invocation behavior

Browse Source
This commit is contained in:
sxyazi 2024-03-31 15:37:03 +08:00
parent c240602046
commit 3553a4a61e
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yazi-plugin/src/loader/require.rs
View File

@ -39,7 +39,7 @@ impl Require {
if key.to_str()? == "setup" { if key.to_str()? == "setup" {
Ok(RequireSetup { name: ts.raw_get("name")?, module: ts.raw_get("module")? }) Ok(RequireSetup { name: ts.raw_get("name")?, module: ts.raw_get("module")? })
} else { } else {
Err("Only `require():setup()` is supported").into_lua_err() Err("Only `require():setup()` and `require().setup()` are supported").into_lua_err()
} }
})?, })?,
)?; )?;
@ -58,7 +58,7 @@ impl UserData for RequireSetup {
fn add_methods<'lua, M: mlua::UserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: mlua::UserDataMethods<'lua, Self>>(methods: &mut M) {
methods.add_meta_method(MetaMethod::Call, |lua, me, args: Variadic<Value>| { methods.add_meta_method(MetaMethod::Call, |lua, me, args: Variadic<Value>| {
lua.named_registry_value::<RtRef>("rt")?.swap(me.name.to_str()?); lua.named_registry_value::<RtRef>("rt")?.swap(me.name.to_str()?);
let result = me.module.call_method::<_, Variadic<Value>>("setup", args); let result = me.module.call_function::<_, Variadic<Value>>("setup", args);
lua.named_registry_value::<RtRef>("rt")?.reset(); lua.named_registry_value::<RtRef>("rt")?.reset();
result result
}); });