Skip to content

Prevent double variadic wrapping when inferring ... #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#[cfg(test)]
mod test {
use crate::{FileId, LuaType, VirtualWorkspace};
use emmylua_parser::LuaLocalStat;

fn get_type_of_first_local_assign(ws: &mut VirtualWorkspace, file_id: FileId) -> LuaType {
let node: LuaLocalStat = ws.get_node(file_id);
let expr = &node.get_value_exprs().next().unwrap();
let semantic_model = ws.analysis.compilation.get_semantic_model(file_id).unwrap();
semantic_model.infer_expr(expr.clone()).unwrap()
}

#[test]
fn test_dots_normal() {
let mut ws = VirtualWorkspace::new();

let file_id = ws.def(
r#"
--- @param ... integer
function foo(...)
local a = { ... }
end
"#,
);
let a_ty = get_type_of_first_local_assign(&mut ws, file_id);
let a_expected = ws.ty("integer[]");
assert_eq!(a_ty, a_expected);
}

#[test]
fn test_dots_normal_variadic() {
let mut ws = VirtualWorkspace::new();

let file_id = ws.def(
r#"
--- @param ... integer...
function foo(...)
local a = { ... }
end
"#,
);
let a_ty = get_type_of_first_local_assign(&mut ws, file_id);
let a_expected = ws.ty("integer[]");
assert_eq!(a_ty, a_expected);
}

#[test]
fn test_dots_generic() {
let mut ws = VirtualWorkspace::new();

let file_id = ws.def(
r#"
--- @generic T
--- @param ... T
function foo(...)
local a = { ... }
end
"#,
);
let a_ty = get_type_of_first_local_assign(&mut ws, file_id);
assert_eq!(&ws.humanize_type(a_ty), "T[]");
}

#[test]
fn test_dots_variadic() {
let mut ws = VirtualWorkspace::new();

let file_id = ws.def(
r#"
--- @generic T
--- @param ... T...
function foo(...)
local a = { ... }
end
"#,
);
let a_ty = get_type_of_first_local_assign(&mut ws, file_id);
assert_eq!(&ws.humanize_type(a_ty), "T[]");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the intended usage.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, but I'm not sure how to compare types properly without hardcoding GenericTplIds?

}
}
1 change: 1 addition & 0 deletions crates/emmylua_code_analysis/src/compilation/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ mod closure_param_infer_test;
mod closure_return_test;
mod decl_test;
mod diagnostic_disable_test;
mod dots_infer_test;
mod export_test;
mod flow;
mod for_range_var_infer_test;
Expand Down
6 changes: 5 additions & 1 deletion crates/emmylua_code_analysis/src/semantic/infer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ fn infer_literal_expr(db: &DbIndex, config: &LuaInferCache, expr: LuaLiteralExpr
Some(decl) if decl.is_global() => LuaType::Any,
Some(decl) if decl.is_param() => {
let base = infer_param(db, decl).unwrap_or(LuaType::Unknown);
LuaType::Variadic(VariadicType::Base(base).into())
if matches!(base, LuaType::Variadic(_)) {
base
} else {
LuaType::Variadic(VariadicType::Base(base).into())
}
}
_ => LuaType::Any, // 默认返回 Any
};
Expand Down
Loading