remove export check

Author: CppCXY

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

@@ -1,14 +1,13 @@
 use std::collections::HashSet;
 
 use emmylua_parser::{
-    LuaAst, LuaAstNode, LuaCallExpr, LuaElseIfClauseStat, LuaForRangeStat, LuaForStat, LuaIfStat,
-    LuaIndexExpr, LuaIndexKey, LuaRepeatStat, LuaSyntaxKind, LuaTokenKind, LuaVarExpr,
-    LuaWhileStat,
+    LuaAst, LuaAstNode, LuaElseIfClauseStat, LuaForRangeStat, LuaForStat, LuaIfStat, LuaIndexExpr,
+    LuaIndexKey, LuaRepeatStat, LuaSyntaxKind, LuaTokenKind, LuaVarExpr, LuaWhileStat,
 };
 
 use crate::{
     DiagnosticCode, InferFailReason, LuaMemberKey, LuaSemanticDeclId, LuaType, ModuleInfo,
-    SemanticModel, enum_variable_is_param, parse_require_module_info,
+    SemanticModel, enum_variable_is_param,
 };
 
 use super::{Checker, DiagnosticContext, humanize_lint_type};
@@ -64,18 +63,19 @@ fn check_index_expr(
     let prefix_typ = semantic_model
         .infer_expr(index_expr.get_prefix_expr()?)
         .unwrap_or(LuaType::Unknown);
-    let mut module_info = None;
+    // let mut module_info = None;
 
     if is_invalid_prefix_type(&prefix_typ) {
-        if matches!(prefix_typ, LuaType::TableConst(_)) {
-            // 如果导入了被 @export 标记的表常量, 那么不应该跳过检查
-            module_info = check_require_table_const_with_export(semantic_model, index_expr);
-            if module_info.is_none() {
-                return Some(());
-            }
-        } else {
-            return Some(());
-        }
+        // if matches!(prefix_typ, LuaType::TableConst(_)) {
+        //     // 如果导入了被 @export 标记的表常量, 那么不应该跳过检查
+        //     module_info = check_require_table_const_with_export(semantic_model, index_expr);
+        //     if module_info.is_none() {
+        //         return Some(());
+        //     }
+        // } else {
+
+        // }
+        return Some(());
     }
 
     let index_key = index_expr.get_index_key()?;
@@ -86,7 +86,7 @@ fn check_index_expr(
         index_expr,
         &index_key,
         code,
-        module_info,
+        None,
     )
     .is_some()
     {
@@ -479,57 +479,57 @@ fn check_enum_is_param(
     )
 }
 
-/// 检查导入的表常量
-fn check_require_table_const_with_export<'a>(
-    semantic_model: &'a SemanticModel,
-    index_expr: &LuaIndexExpr,
-) -> Option<&'a ModuleInfo> {
-    // 获取前缀表达式的语义信息
-    let prefix_expr = index_expr.get_prefix_expr()?;
-    if let Some(call_expr) = LuaCallExpr::cast(prefix_expr.syntax().clone()) {
-        let module_info = parse_require_expr_module_info(semantic_model, &call_expr)?;
-        if module_info.is_export(semantic_model.get_db()) {
-            return Some(module_info);
-        }
-    }
-
-    let semantic_info = semantic_model.get_semantic_info(prefix_expr.syntax().clone().into())?;
-
-    // 检查是否是声明引用
-    let decl_id = match semantic_info.semantic_decl? {
-        LuaSemanticDeclId::LuaDecl(decl_id) => decl_id,
-        _ => return None,
-    };
-
-    // 获取声明
-    let decl = semantic_model
-        .get_db()
-        .get_decl_index()
-        .get_decl(&decl_id)?;
-
-    let module_info = parse_require_module_info(semantic_model, decl)?;
-    if module_info.is_export(semantic_model.get_db()) {
-        return Some(module_info);
-    }
-    None
-}
-
-pub fn parse_require_expr_module_info<'a>(
-    semantic_model: &'a SemanticModel,
-    call_expr: &LuaCallExpr,
-) -> Option<&'a ModuleInfo> {
-    let arg_list = call_expr.get_args_list()?;
-    let first_arg = arg_list.get_args().next()?;
-    let require_path_type = semantic_model.infer_expr(first_arg.clone()).ok()?;
-    let module_path: String = match &require_path_type {
-        LuaType::StringConst(module_path) => module_path.as_ref().to_string(),
-        _ => {
-            return None;
-        }
-    };
-
-    semantic_model
-        .get_db()
-        .get_module_index()
-        .find_module(&module_path)
-}
+// /// 检查导入的表常量
+// fn check_require_table_const_with_export<'a>(
+//     semantic_model: &'a SemanticModel,
+//     index_expr: &LuaIndexExpr,
+// ) -> Option<&'a ModuleInfo> {
+//     // 获取前缀表达式的语义信息
+//     let prefix_expr = index_expr.get_prefix_expr()?;
+//     if let Some(call_expr) = LuaCallExpr::cast(prefix_expr.syntax().clone()) {
+//         let module_info = parse_require_expr_module_info(semantic_model, &call_expr)?;
+//         if module_info.is_export(semantic_model.get_db()) {
+//             return Some(module_info);
+//         }
+//     }
+
+//     let semantic_info = semantic_model.get_semantic_info(prefix_expr.syntax().clone().into())?;
+
+//     // 检查是否是声明引用
+//     let decl_id = match semantic_info.semantic_decl? {
+//         LuaSemanticDeclId::LuaDecl(decl_id) => decl_id,
+//         _ => return None,
+//     };
+
+//     // 获取声明
+//     let decl = semantic_model
+//         .get_db()
+//         .get_decl_index()
+//         .get_decl(&decl_id)?;
+
+//     let module_info = parse_require_module_info(semantic_model, decl)?;
+//     if module_info.is_export(semantic_model.get_db()) {
+//         return Some(module_info);
+//     }
+//     None
+// }
+
+// pub fn parse_require_expr_module_info<'a>(
+//     semantic_model: &'a SemanticModel,
+//     call_expr: &LuaCallExpr,
+// ) -> Option<&'a ModuleInfo> {
+//     let arg_list = call_expr.get_args_list()?;
+//     let first_arg = arg_list.get_args().next()?;
+//     let require_path_type = semantic_model.infer_expr(first_arg.clone()).ok()?;
+//     let module_path: String = match &require_path_type {
+//         LuaType::StringConst(module_path) => module_path.as_ref().to_string(),
+//         _ => {
+//             return None;
+//         }
+//     };
+
+//     semantic_model
+//         .get_db()
+//         .get_module_index()
+//         .find_module(&module_path)
+// }

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

@@ -151,63 +151,63 @@ mod test {
     //     ));
     // }
 
-    #[test]
-    fn test_export() {
-        let mut ws = VirtualWorkspace::new();
-        ws.def_file(
-            "a.lua",
-            r#"
-            ---@export
-            local export = {}
+    // #[test]
+    // fn test_export() {
+    //     let mut ws = VirtualWorkspace::new();
+    //     ws.def_file(
+    //         "a.lua",
+    //         r#"
+    //         ---@export
+    //         local export = {}
 
-            export.a = 1
+    //         export.a = 1
 
-            return export
-            "#,
-        );
-        assert!(!ws.check_code_for(
-            DiagnosticCode::InjectField,
-            r#"
-            local a = require("a")
-            a.newField = 1
-            "#,
-        ));
-        assert!(ws.check_code_for(
-            DiagnosticCode::InjectField,
-            r#"
-            local a = require("a")
-            a.a = 2
-            "#,
-        ));
-    }
+    //         return export
+    //         "#,
+    //     );
+    //     assert!(!ws.check_code_for(
+    //         DiagnosticCode::InjectField,
+    //         r#"
+    //         local a = require("a")
+    //         a.newField = 1
+    //         "#,
+    //     ));
+    //     assert!(ws.check_code_for(
+    //         DiagnosticCode::InjectField,
+    //         r#"
+    //         local a = require("a")
+    //         a.a = 2
+    //         "#,
+    //     ));
+    // }
 
-    #[test]
-    fn test_export_2() {
-        let mut ws = VirtualWorkspace::new();
-        ws.def_file(
-            "a.lua",
-            r#"
-            ---@export
-            return {
-                a = 1
-            }
-            "#,
-        );
-        assert!(!ws.check_code_for(
-            DiagnosticCode::InjectField,
-            r#"
-            local a = require("a")
-            a.newField = 1
-            "#,
-        ));
-        assert!(ws.check_code_for(
-            DiagnosticCode::InjectField,
-            r#"
-            local a = require("a")
-            a.a = 2
-            "#,
-        ));
-    }
+    // #[test]
+    // fn test_export_2() {
+    //     let mut ws = VirtualWorkspace::new();
+    //     ws.def_file(
+    //         "a.lua",
+    //         r#"
+    //         ---@export
+    //         return {
+    //             a = 1
+    //         }
+    //         "#,
+    //     );
+    //     assert!(!ws.check_code_for(
+    //         DiagnosticCode::InjectField,
+    //         r#"
+    //         local a = require("a")
+    //         a.newField = 1
+    //         "#,
+    //     ));
+    //     assert!(ws.check_code_for(
+    //         DiagnosticCode::InjectField,
+    //         r#"
+    //         local a = require("a")
+    //         a.a = 2
+    //         "#,
+    //     ));
+    // }
 
     #[test]
     fn test_issue_660() {

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

@@ -736,31 +736,31 @@ mod test {
         ));
     }
 
-    #[test]
-    fn test_export() {
-        let mut ws = VirtualWorkspace::new();
-        ws.def_file(
-            "a.lua",
-            r#"
-            ---@export
-            local export = {}
-
-            return export
-            "#,
-        );
-        assert!(!ws.check_code_for(
-            DiagnosticCode::UndefinedField,
-            r#"
-            local a = require("a")
-            a.func()
-            "#,
-        ));
-
-        assert!(!ws.check_code_for(
-            DiagnosticCode::UndefinedField,
-            r#"
-            local a = require("a").ABC
-            "#,
-        ));
-    }
+    // #[test]
+    // fn test_export() {
+    //     let mut ws = VirtualWorkspace::new();
+    //     ws.def_file(
+    //         "a.lua",
+    //         r#"
+    //         ---@export
+    //         local export = {}
+
+    //         return export
+    //         "#,
+    //     );
+    //     assert!(!ws.check_code_for(
+    //         DiagnosticCode::UndefinedField,
+    //         r#"
+    //         local a = require("a")
+    //         a.func()
+    //         "#,
+    //     ));
+
+    //     assert!(!ws.check_code_for(
+    //         DiagnosticCode::UndefinedField,
+    //         r#"
+    //         local a = require("a").ABC
+    //         "#,
+    //     ));
+    // }
 }