Merge pull request #768 from ribru17/narrow_sw_fixup

CppCXY · web-flow · commit 0a3ac89126f4 · 2025-09-17T11:30:09.000+08:00
fix: proper ref id starts_with() check
diff --git a/crates/emmylua_code_analysis/src/semantic/infer/narrow/var_ref_id.rs b/crates/emmylua_code_analysis/src/semantic/infer/narrow/var_ref_id.rs
@@ -54,9 +54,9 @@ impl VarRefId {
 
         match prefix {
             VarRefId::VarRef(decl_id) => decl_or_member_id.as_decl_id() == Some(*decl_id),
-            VarRefId::SelfRef(decl_or_member_id) => decl_or_member_id == decl_or_member_id,
-            VarRefId::IndexRef(decl_or_member_id, prefix_path) => {
-                decl_or_member_id == decl_or_member_id
+            VarRefId::SelfRef(ref_decl_or_member_id) => *ref_decl_or_member_id == decl_or_member_id,
+            VarRefId::IndexRef(ref_decl_or_member_id, prefix_path) => {
+                *ref_decl_or_member_id == decl_or_member_id
                     && path.starts_with(prefix_path.deref().as_str())
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ impl VarRefId {`
`54`	`54`
`55`	`55`	`match prefix {`
`56`	`56`	`VarRefId::VarRef(decl_id) => decl_or_member_id.as_decl_id() == Some(*decl_id),`
`57`		`- VarRefId::SelfRef(decl_or_member_id) => decl_or_member_id == decl_or_member_id,`
`58`		`- VarRefId::IndexRef(decl_or_member_id, prefix_path) => {`
`59`		`- decl_or_member_id == decl_or_member_id`
	`57`	`+ VarRefId::SelfRef(ref_decl_or_member_id) => *ref_decl_or_member_id == decl_or_member_id,`
	`58`	`+ VarRefId::IndexRef(ref_decl_or_member_id, prefix_path) => {`
	`59`	`+ *ref_decl_or_member_id == decl_or_member_id`
`60`	`60`	`&& path.starts_with(prefix_path.deref().as_str())`
`61`	`61`	`}`
`62`	`62`	`}`