Skip to content

Commit e9a21ea

Browse files
committed
fix infer
1 parent e34a745 commit e9a21ea

File tree

2 files changed

+8
-8
lines changed
  • crates/code_analysis/src

2 files changed

+8
-8
lines changed

crates/code_analysis/src/compilation/analyzer/unresolve/resolve.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ pub fn try_resolve_decl(
3232
pub fn try_resolve_member(
3333
db: &mut DbIndex,
3434
config: &mut LuaInferConfig,
35-
member: &mut UnResolveMember,
35+
unresolve_member: &mut UnResolveMember,
3636
) -> Option<bool> {
37-
if let Some(prefix_expr) = &member.prefix {
37+
if let Some(prefix_expr) = &unresolve_member.prefix {
3838
let prefix_type = infer_expr(db, config, prefix_expr.clone())?;
3939
let member_owner = match prefix_type {
4040
LuaType::TableConst(in_file_range) => LuaMemberOwner::Element(in_file_range),
@@ -52,23 +52,23 @@ pub fn try_resolve_member(
5252
return None;
5353
}
5454
};
55-
let member_id = member.member_id.clone();
55+
let member_id = unresolve_member.member_id.clone();
5656
db.get_member_index_mut()
5757
.add_member_owner(member_owner, member_id);
58-
member.prefix = None;
58+
unresolve_member.prefix = None;
5959
}
6060

61-
let expr = member.expr.clone();
61+
let expr = unresolve_member.expr.clone();
6262
let expr_type = infer_expr(db, config, expr)?;
6363
let expr_type = match &expr_type {
6464
LuaType::MuliReturn(multi) => multi
65-
.get_type(member.ret_idx)
65+
.get_type(unresolve_member.ret_idx)
6666
.cloned()
6767
.unwrap_or(LuaType::Unknown),
6868
_ => expr_type,
6969
};
7070

71-
let member_id = member.member_id;
71+
let member_id = unresolve_member.member_id;
7272
merge_member_type(db, member_id, expr_type);
7373
Some(true)
7474
}

crates/code_analysis/src/db_index/member/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl LuaMemberIndex {
5050
self.owner_members
5151
.entry(owner)
5252
.or_insert_with(HashMap::new)
53-
.insert(key, id);
53+
.entry(key).or_insert(id);
5454

5555
Some(())
5656
}

0 commit comments

Comments
 (0)