update @export: 对标记了@export的导出变量实施自动导入控制

Author: xuhuanzy

crates/emmylua_code_analysis/src/semantic/visibility/export.rs

@@ -6,12 +6,19 @@ pub fn check_export_visibility(
 ) -> Option<bool> {
     // 检查模块是否有 export 标记
     let property_owner_id = module_info.property_owner_id.clone()?;
-    let property = semantic_model
+    let common_property = semantic_model
         .get_db()
         .get_property_index()
-        .get_property(&property_owner_id)?
-        .export
-        .as_ref()?;
+        .get_property(&property_owner_id);
+    let Some(common_property) = common_property else {
+        return Some(true);
+    };
+
+    let Some(property) = common_property.export.as_ref() else {
+        // 没有 export 标记, 视为可见
+        return Some(true);
+    };
+
     match property.scope {
         LuaExportScope::Namespace => {
             let type_index = semantic_model.get_db().get_type_index();

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

@@ -70,6 +70,10 @@ fn add_module_completion_item(
     position: Position,
     completions: &mut Vec<CompletionItem>,
 ) -> Option<()> {
+    if !check_export_visibility(&builder.semantic_model, &module_info).unwrap_or(false) {
+        return None;
+    }
+
     let completion_name = module_name_convert(module_info, file_conversion);
     if !completion_name.to_lowercase().starts_with(prefix) {
         try_add_member_completion_items(
@@ -123,10 +127,6 @@ fn try_add_member_completion_items(
     position: Position,
     completions: &mut Vec<CompletionItem>,
 ) -> Option<()> {
-    if !check_export_visibility(&builder.semantic_model, &module_info).unwrap_or(false) {
-        return None;
-    }
-
     if let Some(export_type) = &module_info.export_type {
         match export_type {
             LuaType::TableConst(_) | LuaType::Def(_) => {