update

Author: CppCXY

crates/emmylua_code_analysis/src/compilation/analyzer/flow/bind_analyze/stats.rs

@@ -7,9 +7,7 @@ use emmylua_parser::{
 use crate::{
     compilation::analyzer::flow::{
         bind_analyze::{
-            bind_block, bind_each_child,
-            exprs::{bind_condition_expr, bind_expr},
-            finish_flow_label,
+            bind_block, bind_each_child, bind_node, exprs::{bind_condition_expr, bind_expr}, finish_flow_label
         },
         binder::FlowBinder,
     },
@@ -32,6 +30,11 @@ pub fn bind_local_stat(
         binder.decl_bind_flow_ref.insert(decl_id, flow_id);
     }
 
+    for value in values {
+        // If there are more values than names, we still need to bind the values
+        bind_expr(binder, value.clone(), current);
+    }
+
     let local_flow_id = binder.create_decl(local_stat.get_position());
     binder.add_antecedent(local_flow_id, current);
     local_flow_id
@@ -46,13 +49,13 @@ pub fn bind_assign_stat(
     // First bind the right-hand side expressions
     for expr in &values {
         if let Some(ast) = LuaAst::cast(expr.syntax().clone()) {
-            bind_each_child(binder, ast, current);
+            bind_node(binder, ast, current);
         }
     }
 
     for var in &vars {
         if let Some(ast) = LuaAst::cast(var.syntax().clone()) {
-            bind_each_child(binder, ast, current);
+            bind_node(binder, ast, current);
         }
     }
 

crates/emmylua_code_analysis/src/semantic/infer/narrow/condition_flow/binary_flow.rs

@@ -234,7 +234,7 @@ fn maybe_var_eq_narrow(
                     TypeOps::Remove.apply(db, &antecedent_type, &right_expr_type)
                 }
             };
-            return Ok(ResultTypeOrContinue::Result(result_type));
+            Ok(ResultTypeOrContinue::Result(result_type))
         }
         LuaExpr::CallExpr(left_call_expr) => {
             match right_expr {
@@ -262,16 +262,38 @@ fn maybe_var_eq_narrow(
                 _ => {}
             };
 
-            return Ok(ResultTypeOrContinue::Continue);
+            Ok(ResultTypeOrContinue::Continue)
         }
-        LuaExpr::IndexExpr(_) => {
-            // todo
+        LuaExpr::IndexExpr(left_index_expr) => {
+            let Some(maybe_ref_id) =
+                get_var_expr_var_ref_id(db, cache, LuaExpr::IndexExpr(left_index_expr.clone()))
+            else {
+                return Ok(ResultTypeOrContinue::Continue);
+            };
+
+            if maybe_ref_id != *var_ref_id {
+                // If the reference declaration ID does not match, we cannot narrow it
+                return Ok(ResultTypeOrContinue::Continue);
+            }
+
+            let right_expr_type = infer_expr(db, cache, right_expr)?;
+            let antecedent_flow_id = get_single_antecedent(tree, flow_node)?;
+            let antecedent_type =
+                get_type_at_flow(db, tree, cache, root, &var_ref_id, antecedent_flow_id)?;
+
+            let result_type = match condition_flow {
+                InferConditionFlow::TrueCondition => {
+                    TypeOps::Narrow.apply(db, &antecedent_type, &right_expr_type)
+                }
+                InferConditionFlow::FalseCondition => {
+                    TypeOps::Remove.apply(db, &antecedent_type, &right_expr_type)
+                }
+            };
+            Ok(ResultTypeOrContinue::Result(result_type))
         }
         _ => {
             // If the left expression is not a name or call expression, we cannot narrow it
-            return Ok(ResultTypeOrContinue::Continue);
+            Ok(ResultTypeOrContinue::Continue)
         }
     }
-
-    Ok(ResultTypeOrContinue::Continue)
 }

crates/emmylua_code_analysis/src/semantic/infer/narrow/get_type_at_flow.rs

@@ -180,7 +180,7 @@ fn get_type_at_assign_stat(
             continue;
         };
 
-        if maybe_ref_id == *var_ref_id {
+        if maybe_ref_id != *var_ref_id {
             // let typ = get_var_ref_type(db, cache, var_ref_id)?;
             continue;
         }