Fix #660

Author: CppCXY

crates/emmylua_code_analysis/src/diagnostic/checker/assign_type_mismatch.rs

@@ -131,7 +131,7 @@ fn check_index_expr(
 ) -> Option<()> {
     let source_type = infer_index_expr(
         semantic_model.get_db(),
-        &mut semantic_model.get_config().borrow_mut(),
+        &mut semantic_model.get_cache().borrow_mut(),
         index_expr.clone(),
         false,
     )

crates/emmylua_code_analysis/src/diagnostic/checker/check_field.rs

@@ -192,17 +192,18 @@ fn is_valid_member(
     let need_add_diagnostic =
         match semantic_model.get_semantic_info(index_expr.syntax().clone().into()) {
             Some(info) => {
-                let need = info.semantic_decl.is_none() && info.typ.is_unknown();
+                let mut need = info.semantic_decl.is_none();
+                if need {
+                    let decl_type = semantic_model.get_index_decl_type(index_expr.clone());
+                    if let Some(typ) = decl_type {
+                        if !typ.is_unknown() {
+                            need = false;
+                        }
+                    }
+                }
+
                 // TODO: 元组类型的检查或许需要独立出来
                 if !need && matches!(code, DiagnosticCode::InjectField) {
-                    // if let LuaType::Tuple(tuple) = prefix_typ {
-                    //     if tuple.is_infer_resolve() {
-                    //         return Some(());
-                    //     } else {
-                    //         // 元组类型禁止修改
-                    //         return None;
-                    //     }
-                    // }
                     // 前缀是导入的表常量, 检查定义的文件是否与导入的表常量相同, 不同则认为是非法的
                     if let Some(module_info) = module_info {
                         if let Some(LuaSemanticDeclId::Member(member_id)) = info.semantic_decl {
@@ -497,7 +498,7 @@ fn check_enum_is_param(
 ) -> Option<()> {
     enum_variable_is_param(
         semantic_model.get_db(),
-        &mut semantic_model.get_config().borrow_mut(),
+        &mut semantic_model.get_cache().borrow_mut(),
         index_expr,
         prefix_typ,
     )

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

@@ -208,4 +208,32 @@ mod test {
             "#,
         ));
     }
+
+    #[test]
+    fn test_issue_660() {
+        let mut ws = VirtualWorkspace::new();
+        ws.def_file(
+            "a.lua",
+            r#"
+            --- @class (private) vim.var_accessor
+            --- @field [string] any
+            --- @field [integer] vim.var_accessor
+
+            vim = {}
+
+            ---@type vim.var_accessor
+            vim.g = {}
+            "#,
+        );
+        assert!(ws.check_code_for(
+            DiagnosticCode::InjectField,
+            r#"
+            if vim.g.aaa then
+                return
+            end
+
+            vim.g.aaa = true
+            "#,
+        ));
+    }
 }

crates/emmylua_code_analysis/src/semantic/mod.rs

@@ -16,8 +16,8 @@ use std::{collections::HashSet, sync::Arc};
 pub use cache::{CacheEntry, CacheOptions, LuaAnalysisPhase, LuaInferCache};
 pub use decl::{enum_variable_is_param, parse_require_module_info};
 use emmylua_parser::{
-    LuaCallExpr, LuaChunk, LuaExpr, LuaIndexKey, LuaParseError, LuaSyntaxNode, LuaSyntaxToken,
-    LuaTableExpr,
+    LuaCallExpr, LuaChunk, LuaExpr, LuaIndexExpr, LuaIndexKey, LuaParseError, LuaSyntaxNode,
+    LuaSyntaxToken, LuaTableExpr,
 };
 pub use infer::infer_index_expr;
 use infer::{infer_bind_value_type, infer_expr_list_types};
@@ -268,7 +268,7 @@ impl<'a> SemanticModel<'a> {
         self.file_id
     }
 
-    pub fn get_config(&self) -> &RefCell<LuaInferCache> {
+    pub fn get_cache(&self) -> &RefCell<LuaInferCache> {
         &self.infer_cache
     }
 
@@ -296,6 +296,11 @@ impl<'a> SemanticModel<'a> {
     pub fn get_member_origin_owner(&self, member_id: LuaMemberId) -> Option<LuaSemanticDeclId> {
         find_member_origin_owner(self.db, &mut self.infer_cache.borrow_mut(), member_id)
     }
+
+    pub fn get_index_decl_type(&self, index_expr: LuaIndexExpr) -> Option<LuaType> {
+        let cache = &mut self.infer_cache.borrow_mut();
+        infer_index_expr(self.db, cache, index_expr, false).ok()
+    }
 }
 
 /// Guard to prevent infinite recursion

crates/emmylua_ls/src/handlers/completion/providers/member_provider.rs

@@ -31,7 +31,7 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
     // 如果是枚举类型且为函数参数, 则不进行补全
     if enum_variable_is_param(
         builder.semantic_model.get_db(),
-        &mut builder.semantic_model.get_config().borrow_mut(),
+        &mut builder.semantic_model.get_cache().borrow_mut(),
         &index_expr,
         &prefix_type,
     )

crates/emmylua_ls/src/handlers/definition/goto_function.rs

@@ -114,7 +114,7 @@ pub fn compare_function_types(
     if func.contain_tpl() {
         let instantiated_func = instantiate_func_generic(
             semantic_model.get_db(),
-            &mut semantic_model.get_config().borrow_mut(),
+            &mut semantic_model.get_cache().borrow_mut(),
             func,
             call_expr.clone(),
         )