Merge pull request #419 from xuhuanzy/fix

fix

Author: CppCXY

crates/emmylua_code_analysis/src/compilation/analyzer/flow/build_flow_tree.rs

@@ -67,7 +67,7 @@ fn build_name_expr_flow(
 ) -> Option<()> {
     let parent = name_expr.get_parent::<LuaAst>()?;
     let mut is_assign = false;
-    match parent {
+    match &parent {
         LuaAst::LuaIndexExpr(_) | LuaAst::LuaCallExpr(_) | LuaAst::LuaFuncStat(_) => return None,
         LuaAst::LuaAssignStat(assign_stat) => {
             let eq_pos = assign_stat
@@ -87,7 +87,20 @@ fn build_name_expr_flow(
     let mut ref_id: Option<VarRefId> = None;
     if let Some(local_refs) = db.get_reference_index().get_local_reference(&file_id) {
         if let Some(decl_id) = local_refs.get_decl_id(&name_expr.get_range()) {
-            ref_id = Some(VarRefId::DeclId(decl_id.clone()));
+            if let Some(decl) = db.get_decl_index().get_decl(&decl_id) {
+                // 处理`self`作为参数传入的特殊情况
+                if decl.is_param()
+                    && name_expr
+                        .get_name_text()
+                        .map_or(false, |name| name == "self")
+                {
+                    ref_id = Some(VarRefId::Name(SmolStr::new("self")));
+                } else {
+                    ref_id = Some(VarRefId::DeclId(decl_id.clone()));
+                }
+            } else {
+                ref_id = Some(VarRefId::DeclId(decl_id.clone()));
+            }
         }
     }
 

crates/emmylua_code_analysis/src/compilation/analyzer/flow/var_analyze/broadcast_up.rs

@@ -1,8 +1,7 @@
 use std::sync::Arc;
 
 use emmylua_parser::{
-    BinaryOperator, LuaAst, LuaAstNode, LuaBinaryExpr, LuaExpr, LuaForStat, LuaLiteralToken,
-    UnaryOperator,
+    BinaryOperator, LuaAst, LuaAstNode, LuaBinaryExpr, LuaExpr, LuaLiteralToken, UnaryOperator,
 };
 use smol_str::SmolStr;
 
@@ -185,17 +184,6 @@ pub fn broadcast_up(
                         );
                     }
                 }
-                UnaryOperator::OpLen => {
-                    if let Some(for_stat) = unary_expr.get_parent::<LuaForStat>() {
-                        broadcast_inside_condition_block(
-                            db,
-                            var_trace,
-                            trace_info.with_type_assertion(TypeAssertion::Narrow(LuaType::Table)),
-                            for_stat.get_block()?,
-                            false,
-                        );
-                    }
-                }
                 _ => {}
             }
         }

crates/emmylua_code_analysis/src/compilation/analyzer/unresolve/resolve_closure.rs

@@ -410,13 +410,14 @@ fn resolve_doc_function(
     if signature.resolve_return == SignatureReturnStatus::UnResolve
         || signature.resolve_return == SignatureReturnStatus::InferResolve
     {
-        signature.return_docs.clear();
-        signature.resolve_return = SignatureReturnStatus::DocResolve;
-        signature.return_docs.push(LuaDocReturnInfo {
-            name: None,
-            type_ref: doc_func.get_ret().clone(),
-            description: None,
-        });
+        if signature.return_docs.is_empty() && !doc_func.get_ret().is_nil() {
+            signature.resolve_return = SignatureReturnStatus::DocResolve;
+            signature.return_docs.push(LuaDocReturnInfo {
+                name: None,
+                type_ref: doc_func.get_ret().clone(),
+                description: None,
+            });
+        }
     }
     Some(true)
 }

crates/emmylua_code_analysis/src/compilation/test/closure_param_infer_test.rs

@@ -274,4 +274,49 @@ mod test {
         let expected = ws.ty("number");
         assert_eq!(ws.humanize_type(ty), ws.humanize_type(expected));
     }
+
+    #[test]
+    fn test_issue_416() {
+        let mut ws = VirtualWorkspace::new();
+        ws.def_files(vec![
+            (
+                "test.lua",
+                r#"
+                ---@class CustomEvent
+                ---@field private custom_event_manager? EventManager
+                local M = {}
+
+                ---@return EventManager
+                function newEventManager()
+                end
+
+                function M:event_on()
+                    if not self.custom_event_manager then
+                        self.custom_event_manager = newEventManager()
+                    end
+                    local trigger = self.custom_event_manager:get_trigger()
+                    A = trigger
+                    return trigger
+                end
+            "#,
+            ),
+            (
+                "test2.lua",
+                r#"
+                ---@class Trigger
+
+                ---@class EventManager
+                local EventManager
+
+                ---@return Trigger
+                function EventManager:get_trigger()
+                end
+            "#,
+            ),
+        ]);
+
+        let ty = ws.expr_ty("A");
+        let expected = ws.ty("Trigger");
+        assert_eq!(ws.humanize_type(ty), ws.humanize_type(expected));
+    }
 }

crates/emmylua_code_analysis/src/compilation/test/flow.rs

@@ -617,24 +617,4 @@ end
         let b_expected = ws.ty("string[]");
         assert_eq!(b, b_expected);
     }
-
-    #[test]
-    fn test_issue_405() {
-        let mut ws = VirtualWorkspace::new();
-
-        ws.def(
-            r#"
-            ---@type false|fun(...)[]?
-            local calls
-
-            for i = 1, #calls do
-                a = calls
-            end
-        "#,
-        );
-
-        let a = ws.expr_ty("a");
-        let a_expected = ws.ty("fun(...)[]");
-        assert_eq!(a, a_expected);
-    }
 }

crates/emmylua_code_analysis/src/db_index/type/type_assert.rs

@@ -95,7 +95,9 @@ impl TypeAssertion {
             TypeAssertion::Or(a) => {
                 let mut result = vec![];
                 for assertion in a.iter() {
-                    result.push(assertion.tighten_type(db, config, root, source.clone())?);
+                    if let Ok(t) = assertion.tighten_type(db, config, root, source.clone()) {
+                        result.push(t);
+                    }
                 }
 
                 match result.len() {

crates/emmylua_code_analysis/src/diagnostic/test/need_check_nil_test.rs

@@ -14,22 +14,21 @@ mod test {
         "#
         ));
     }
-
     #[test]
-    fn test_issue_405() {
+    fn test_issue_402() {
         let mut ws = VirtualWorkspace::new();
-        let mut emmyrc = ws.analysis.emmyrc.as_ref().clone();
-        emmyrc.strict.array_index = false;
-        ws.analysis.update_config(emmyrc.into());
         assert!(ws.check_code_for(
             DiagnosticCode::NeedCheckNil,
             r#"
-                ---@type false|fun(...)[]?
-                local calls
+            ---@class A
+            local a = {}
 
-                for i = 1, #calls do
-                    calls[i](...)
+            ---@param self table?
+            function a.new(self)
+                if self then
+                    self.a = 1
                 end
+            end
         "#
         ));
     }