lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-04 10:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix not throwing syntax error in require

Browse source
This commit is contained in:
Someon1e 2024-03-24 22:10:53 +00:00
parent 94ba331ed0
commit 44adf6774e
1 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/lune/globals/require/path.rs
View file

@ -27,8 +27,15 @@ where
'lua: 'ctx,
{
// 1. Try to require the exact path
if let Ok(res) = require_inner(lua, ctx, &abs_path, &rel_path).await {
return Ok(res);
match require_inner(lua, ctx, &abs_path, &rel_path).await {
Ok(res) => return Ok(res),
Err(LuaError::SyntaxError {
message,
incomplete_input: _,
}) => {
return Err(LuaError::runtime(message));
}
Err(_) => {}
}
// 2. Try to require the path with an added "luau" extension
@ -36,8 +43,15 @@ where
append_extension(&abs_path, "luau"),
append_extension(&rel_path, "luau"),
);
if let Ok(res) = require_inner(lua, ctx, &luau_abs_path, &luau_rel_path).await {
return Ok(res);
match require_inner(lua, ctx, &luau_abs_path, &luau_rel_path).await {
Ok(res) => return Ok(res),
Err(LuaError::SyntaxError {
message,
incomplete_input: _,
}) => {
return Err(LuaError::runtime(message));
}
Err(_) => {}
}
// 3. Try to require the path with an added "lua" extension
@ -45,8 +59,15 @@ where
append_extension(&abs_path, "lua"),
append_extension(&rel_path, "lua"),
);
if let Ok(res) = require_inner(lua, ctx, &lua_abs_path, &lua_rel_path).await {
return Ok(res);
match require_inner(lua, ctx, &lua_abs_path, &lua_rel_path).await {
Ok(res) => return Ok(res),
Err(LuaError::SyntaxError {
message,
incomplete_input: _,
}) => {
return Err(LuaError::runtime(message));
}
Err(_) => {}
}
// We didn't find any direct file paths, look
@ -59,8 +80,15 @@ where
append_extension(&abs_init, "luau"),
append_extension(&rel_init, "luau"),
);
if let Ok(res) = require_inner(lua, ctx, &luau_abs_init, &luau_rel_init).await {
return Ok(res);
match require_inner(lua, ctx, &luau_abs_init, &luau_rel_init).await {
Ok(res) => return Ok(res),
Err(LuaError::SyntaxError {
message,
incomplete_input: _,
}) => {
return Err(LuaError::runtime(message));
}
Err(_) => {}
}
// 5. Try to require the init path with an added "lua" extension
@ -68,8 +96,15 @@ where
append_extension(&abs_init, "lua"),
append_extension(&rel_init, "lua"),
);
if let Ok(res) = require_inner(lua, ctx, &lua_abs_init, &lua_rel_init).await {
return Ok(res);
match require_inner(lua, ctx, &lua_abs_init, &lua_rel_init).await {
Ok(res) => return Ok(res),
Err(LuaError::SyntaxError {
message,
incomplete_input: _,
}) => {
return Err(LuaError::runtime(message));
}
Err(_) => {}
}
// Nothing left to try, throw an error