Merge pull request #817 from xuhuanzy/fix

fix && update

Author: CppCXY

CHANGELOG.md

@@ -12,14 +12,17 @@
 ### ✨ Added
 - **Attribute**: 实现了新的特性`---@attribute`，用于定义附加元数据，内置多个特性：
 ```lua
+
 --- Deprecated. Receives an optional message parameter.
 ---@attribute deprecated(message: string?)
 
---- Language Server Performance Optimization Items.
+--- Language Server Optimization Items.
 ---
---- Receives a parameter, the options are:
---- - `check_table_field` - Skip the assign check for table fields. It is recommended to use this option for all large configuration tables.
----@attribute lsp_perf_optim(code: "check_table_field"|string)
+--- Parameters:
+--- - `check_table_field`: Skip the assign check for table fields. It is recommended to use this option for all large configuration tables.
+--- - `delayed_definition`: Indicates that the type of the variable is determined by the first assignment.
+---    Only valid for `local` declarations with no initial value.
+---@attribute lsp_optimization(code: "check_table_field"|"delayed_definition")
 
 --- Index field alias, will be displayed in `hint` and `completion`.
 ---
@@ -30,19 +33,19 @@
 --- used to specify the default constructor of a class.
 ---
 --- Parameters:
---- - `name` - The name of the method as a constructor.
---- - `root_class` - Used to mark the root class, will implicitly inherit this class, such as `System.Object` in c#. Defaults to empty.
---- - `strip_self` - Whether the `self` parameter can be omitted when calling the constructor, defaults to `true`
---- - `return_self` - Whether the constructor is forced to return `self`, defaults to `true`
+--- - `name`: The name of the method as a constructor.
+--- - `root_class`: Used to mark the root class, will implicitly inherit this class, such as `System.Object` in c#. Defaults to empty.
+--- - `strip_self`: Whether the `self` parameter can be omitted when calling the constructor, defaults to `true`
+--- - `return_self`: Whether the constructor is forced to return `self`, defaults to `true`
 ---@attribute constructor(name: string, root_class: string?, strip_self: boolean?, return_self: boolean?)
 
 --- Associates `getter` and `setter` methods with a field. Currently provides only definition navigation functionality,
 --- and the target methods must reside within the same class.
 ---
 --- Parameters:
---- - convention: Naming convention, defaults to `camelCase`. Implicitly adds `get` and `set` prefixes. eg: `_age` -> `getAge`, `setAge`.
---- - getter: Getter method name. Takes precedence over `convention`.
---- - setter: Setter method name. Takes precedence over `convention`.
+--- - `convention`: Naming convention, defaults to `camelCase`. Implicitly adds `get` and `set` prefixes. eg: `_age` -> `getAge`, `setAge`.
+--- - `getter`: Getter method name. Takes precedence over `convention`.
+--- - `setter`: Setter method name. Takes precedence over `convention`.
 ---@attribute field_accessor(convention: "camelCase"|"PascalCase"|"snake_case"|nil, getter: string?, setter: string?)
 ```
 

crates/emmylua_code_analysis/resources/std/builtin.lua

@@ -144,11 +144,13 @@
 --- Deprecated. Receives an optional message parameter.
 ---@attribute deprecated(message: string?)
 
---- Language Server Performance Optimization Items.
+--- Language Server Optimization Items.
 ---
---- Receives a parameter, the options are:
---- - `check_table_field` - Skip the assign check for table fields. It is recommended to use this option for all large configuration tables.
----@attribute lsp_perf_optim(code: "check_table_field"|string)
+--- Parameters:
+--- - `check_table_field`: Skip the assign check for table fields. It is recommended to use this option for all large configuration tables.
+--- - `delayed_definition`: Indicates that the type of the variable is determined by the first assignment.
+---    Only valid for `local` declarations with no initial value.
+---@attribute lsp_optimization(code: "check_table_field"|"delayed_definition")
 
 --- Index field alias, will be displayed in `hint` and `completion`.
 ---
@@ -159,17 +161,17 @@
 --- used to specify the default constructor of a class.
 ---
 --- Parameters:
---- - `name` - The name of the method as a constructor.
---- - `root_class` - Used to mark the root class, will implicitly inherit this class, such as `System.Object` in c#. Defaults to empty.
---- - `strip_self` - Whether the `self` parameter can be omitted when calling the constructor, defaults to `true`
---- - `return_self` - Whether the constructor is forced to return `self`, defaults to `true`
+--- - `name`: The name of the method as a constructor.
+--- - `root_class`: Used to mark the root class, will implicitly inherit this class, such as `System.Object` in c#. Defaults to empty.
+--- - `strip_self`: Whether the `self` parameter can be omitted when calling the constructor, defaults to `true`
+--- - `return_self`: Whether the constructor is forced to return `self`, defaults to `true`
 ---@attribute constructor(name: string, root_class: string?, strip_self: boolean?, return_self: boolean?)
 
 --- Associates `getter` and `setter` methods with a field. Currently provides only definition navigation functionality,
 --- and the target methods must reside within the same class.
 ---
 --- Parameters:
---- - convention: Naming convention, defaults to `camelCase`. Implicitly adds `get` and `set` prefixes. eg: `_age` -> `getAge`, `setAge`.
---- - getter: Getter method name. Takes precedence over `convention`.
---- - setter: Setter method name. Takes precedence over `convention`.
+--- - `convention`: Naming convention, defaults to `camelCase`. Implicitly adds `get` and `set` prefixes. eg: `_age` -> `getAge`, `setAge`.
+--- - `getter`: Getter method name. Takes precedence over `convention`.
+--- - `setter`: Setter method name. Takes precedence over `convention`.
 ---@attribute field_accessor(convention: "camelCase"|"PascalCase"|"snake_case"|nil, getter: string?, setter: string?)

crates/emmylua_code_analysis/src/compilation/analyzer/lua/stats.rs

@@ -1,10 +1,10 @@
 use emmylua_parser::{
     BinaryOperator, LuaAssignStat, LuaAstNode, LuaExpr, LuaFuncStat, LuaIndexExpr,
-    LuaLocalFuncStat, LuaLocalStat, LuaTableField, LuaVarExpr, PathTrait,
+    LuaLocalFuncStat, LuaLocalStat, LuaNameExpr, LuaTableField, LuaVarExpr, PathTrait,
 };
 
 use crate::{
-    InFiled, InferFailReason, LuaTypeCache, LuaTypeOwner,
+    InFiled, InferFailReason, LuaSemanticDeclId, LuaTypeCache, LuaTypeOwner,
     compilation::analyzer::{
         common::{add_member, bind_type},
         unresolve::{UnResolveDecl, UnResolveMember},
@@ -23,6 +23,10 @@ pub fn analyze_local_stat(analyzer: &mut LuaAnalyzer, local_stat: LuaLocalStat)
         for local_name in name_list {
             let position = local_name.get_position();
             let decl_id = LuaDeclId::new(analyzer.file_id, position);
+            // 标记了延迟定义属性, 此时将跳过绑定类型, 等待第一次赋值时再绑定类型
+            if has_delayed_definition_attribute(analyzer, decl_id) {
+                return Some(());
+            }
             analyzer
                 .db
                 .get_type_index_mut()
@@ -304,6 +308,17 @@ pub fn analyze_assign_stat(analyzer: &mut LuaAnalyzer, assign_stat: LuaAssignSta
                 continue;
             }
         };
+
+        // 如果具有延迟定义属性, 则先绑定最初的定义
+        if let LuaVarExpr::NameExpr(name_expr) = var {
+            if let Some(decl_id) = get_delayed_definition_decl_id(analyzer, name_expr) {
+                bind_type(
+                    analyzer.db,
+                    decl_id.into(),
+                    LuaTypeCache::InferType(expr_type.clone()),
+                );
+            }
+        }
         assign_merge_type_owner_and_expr_type(analyzer, type_owner, &expr_type, 0);
     }
 
@@ -500,3 +515,37 @@ fn special_assign_pattern(
 
     Some(())
 }
+
+fn has_delayed_definition_attribute(analyzer: &LuaAnalyzer, decl_id: LuaDeclId) -> bool {
+    if let Some(property) = analyzer
+        .db
+        .get_property_index()
+        .get_property(&LuaSemanticDeclId::LuaDecl(decl_id))
+    {
+        if let Some(lsp_optimization) = property.find_attribute_use("lsp_optimization") {
+            if let Some(LuaType::DocStringConst(code)) = lsp_optimization.get_param_by_name("code")
+            {
+                if code.as_ref() == "delayed_definition" {
+                    return true;
+                }
+            };
+        }
+    }
+    false
+}
+
+// 获取延迟定义的声明id
+fn get_delayed_definition_decl_id(
+    analyzer: &LuaAnalyzer,
+    name_expr: &LuaNameExpr,
+) -> Option<LuaDeclId> {
+    let file_id = analyzer.file_id;
+    let references_index = analyzer.db.get_reference_index();
+    let range = name_expr.get_range();
+    let file_ref = references_index.get_local_reference(&file_id)?;
+    let decl_id = file_ref.get_decl_id(&range)?;
+    if !has_delayed_definition_attribute(analyzer, decl_id) {
+        return None;
+    }
+    Some(decl_id)
+}

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

@@ -36,9 +36,31 @@ mod test {
         ws.check_code_for(
             DiagnosticCode::AssignTypeMismatch,
             r#"
-        ---@[lsp_perf_optim("check_table_field")]
+        ---@[lsp_optimization("check_table_field")]
         local config = {}
         "#,
         );
     }
+
+    #[test]
+    fn test_delayed_definition() {
+        let mut ws = VirtualWorkspace::new_with_init_std_lib();
+
+        ws.def(
+            r#"
+        ---@[lsp_optimization("delayed_definition")]
+        local config
+
+        function func()
+            A = config
+        end
+
+        config = 1
+        "#,
+        );
+
+        let ty = ws.expr_ty("A");
+        let ty_desc = ws.humanize_type(ty);
+        assert_eq!(ty_desc, "integer");
+    }
 }

crates/emmylua_code_analysis/src/db_index/property/property.rs

@@ -110,11 +110,11 @@ impl LuaCommonProperty {
         self.attribute_uses.as_ref()
     }
 
-    pub fn find_attribute_use(&self, id: LuaTypeDeclId) -> Option<&LuaAttributeUse> {
+    pub fn find_attribute_use(&self, id: &str) -> Option<&LuaAttributeUse> {
         self.attribute_uses.as_ref().and_then(|attribute_uses| {
             attribute_uses
                 .iter()
-                .find(|attribute_use| attribute_use.id == id)
+                .find(|attribute_use| attribute_use.id.get_name() == id)
         })
     }
 }

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

@@ -302,12 +302,17 @@ fn get_real_type_with_depth<'a>(
 
 // 第一个参数是否不应该视为 self
 pub fn first_param_may_not_self(typ: &LuaType) -> bool {
-    if typ.is_table() || matches!(typ, LuaType::Ref(_) | LuaType::Def(_) | LuaType::Any) {
-        return false;
+    if typ.is_table()
+        || matches!(
+            typ,
+            LuaType::TplRef(_) | LuaType::StrTplRef(_) | LuaType::Any
+        )
+    {
+        return true;
     }
+
     if let LuaType::Union(u) = typ {
         return u.into_vec().iter().any(first_param_may_not_self);
     }
-
-    true
+    false
 }

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

@@ -8,8 +8,8 @@ use rowan::{NodeOrToken, TextRange};
 
 use crate::{
     DiagnosticCode, LuaDeclExtra, LuaDeclId, LuaMemberKey, LuaSemanticDeclId, LuaType,
-    LuaTypeDeclId, SemanticDeclLevel, SemanticModel, TypeCheckFailReason, TypeCheckResult,
-    VariadicType, infer_index_expr,
+    SemanticDeclLevel, SemanticModel, TypeCheckFailReason, TypeCheckResult, VariadicType,
+    infer_index_expr,
 };
 
 use super::{Checker, DiagnosticContext, humanize_lint_type};
@@ -219,11 +219,9 @@ pub fn check_table_expr(
             .get_property_index()
             .get_property(&semantic_decl)
         {
-            if let Some(lsp_perf_optim) =
-                property.find_attribute_use(LuaTypeDeclId::new("lsp_perf_optim"))
-            {
+            if let Some(lsp_optimization) = property.find_attribute_use("lsp_optimization") {
                 if let Some(LuaType::DocStringConst(code)) =
-                    lsp_perf_optim.get_param_by_name("code")
+                    lsp_optimization.get_param_by_name("code")
                 {
                     if code.as_ref() == "check_table_field" {
                         return Some(false);

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

@@ -8,7 +8,7 @@ use emmylua_parser::{
 
 use crate::{
     DiagnosticCode, InferFailReason, LuaMemberKey, LuaSemanticDeclId, LuaType, ModuleInfo,
-    SemanticModel, enum_variable_is_param, parse_require_module_info,
+    SemanticDeclLevel, SemanticModel, enum_variable_is_param, parse_require_module_info,
 };
 
 use super::{Checker, DiagnosticContext, humanize_lint_type};
@@ -64,19 +64,18 @@ fn check_index_expr(
     let prefix_typ = semantic_model
         .infer_expr(index_expr.get_prefix_expr()?)
         .unwrap_or(LuaType::Unknown);
-    let 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(());
-        // }
-        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()?;
@@ -480,7 +479,6 @@ fn check_enum_is_param(
     )
 }
 
-#[allow(unused)]
 /// 检查导入的表常量
 fn check_require_table_const_with_export<'a>(
     semantic_model: &'a SemanticModel,
@@ -495,10 +493,12 @@ fn check_require_table_const_with_export<'a>(
         }
     }
 
-    let semantic_info = semantic_model.get_semantic_info(prefix_expr.syntax().clone().into())?;
-
+    let semantic_decl_id = semantic_model.find_decl(
+        prefix_expr.syntax().clone().into(),
+        SemanticDeclLevel::NoTrace,
+    )?;
     // 检查是否是声明引用
-    let decl_id = match semantic_info.semantic_decl? {
+    let decl_id = match semantic_decl_id {
         LuaSemanticDeclId::LuaDecl(decl_id) => decl_id,
         _ => return None,
     };
@@ -509,14 +509,13 @@ fn check_require_table_const_with_export<'a>(
         .get_decl_index()
         .get_decl(&decl_id)?;
 
-    let module_info = parse_require_module_info(semantic_model, decl)?;
+    let module_info = parse_require_module_info(semantic_model, &decl)?;
     if module_info.is_export(semantic_model.get_db()) {
         return Some(module_info);
     }
     None
 }
 
-#[allow(unused)]
 pub fn parse_require_expr_module_info<'a>(
     semantic_model: &'a SemanticModel,
     call_expr: &LuaCallExpr,