fix pr

xuhuanzy · xuhuanzy · commit aaa86db51119 · 2025-04-25T17:40:10.000+08:00
diff --git a/crates/emmylua_code_analysis/resources/schema.json b/crates/emmylua_code_analysis/resources/schema.json
@@ -142,7 +142,7 @@
     },
     "strict": {
       "default": {
-        "arrayIndex": false,
+        "arrayIndex": true,
         "metaOverrideFileDefine": true,
         "requirePath": false,
         "typeCall": false
@@ -850,7 +850,7 @@
       "properties": {
         "arrayIndex": {
           "description": "Whether to enable strict mode array indexing.",
-          "default": false,
+          "default": true,
           "type": "boolean"
         },
         "metaOverrideFileDefine": {
diff --git a/crates/emmylua_code_analysis/resources/std/debug.lua b/crates/emmylua_code_analysis/resources/std/debug.lua
@@ -316,7 +316,7 @@ function debug.traceback(thread, message, level) end
 --- access a same external local variable) will return identical ids for those
 --- upvalue indices.
 ---@version >5.2, JIT
----@param f async fun(...):any...
+---@param f function
 ---@param n integer
 ---@return lightuserdata id
 ---@nodiscard
diff --git a/crates/emmylua_code_analysis/src/compilation/analyzer/flow/var_analyze/var_trace.rs b/crates/emmylua_code_analysis/src/compilation/analyzer/flow/var_analyze/var_trace.rs
@@ -92,8 +92,10 @@ impl<'a> VarTrace<'a> {
             old_info.1.add_trace_info(trace_info);
         } else {
             let trace_info = UnResolveTraceInfo::Trace(trace_info);
-            self.unresolve_traces
-                .insert(trace_id, (self.current_flow_id.unwrap(), trace_info));
+            if let Some(flow_id) = self.current_flow_id {
+                self.unresolve_traces
+                    .insert(trace_id, (flow_id, trace_info));
+            }
         }
     }
 
diff --git a/crates/emmylua_code_analysis/src/config/configs/strict.rs b/crates/emmylua_code_analysis/src/config/configs/strict.rs
@@ -5,6 +5,7 @@ fn default_true() -> bool {
     true
 }
 
+#[allow(dead_code)]
 fn default_false() -> bool {
     false
 }
@@ -18,7 +19,7 @@ pub struct EmmyrcStrict {
     #[serde(default)]
     pub type_call: bool,
     /// Whether to enable strict mode array indexing.
-    #[serde(default = "default_false")]
+    #[serde(default = "default_true")]
     pub array_index: bool,
     /// meta define overrides file define
     #[serde(default = "default_true")]
@@ -30,7 +31,7 @@ impl Default for EmmyrcStrict {
         Self {
             require_path: false,
             type_call: false,
-            array_index: false,
+            array_index: true,
             meta_override_file_define: true,
         }
     }
diff --git a/crates/emmylua_code_analysis/src/db_index/type/type_decl.rs b/crates/emmylua_code_analysis/src/db_index/type/type_decl.rs
@@ -147,7 +147,7 @@ impl LuaTypeDecl {
         }
     }
 
-    pub fn get_alias(&self) -> Option<&LuaType> {
+    pub fn get_alias_ref(&self) -> Option<&LuaType> {
         match &self.extra {
             LuaTypeExtra::Alias { origin, .. } => origin.as_ref(),
             _ => None,
diff --git a/crates/emmylua_code_analysis/src/diagnostic/checker/check_param_count.rs b/crates/emmylua_code_analysis/src/diagnostic/checker/check_param_count.rs
@@ -254,7 +254,7 @@ fn is_nullable(db: &DbIndex, typ: &LuaType) -> bool {
             LuaType::Ref(decl_id) => {
                 if let Some(decl) = db.get_type_index().get_type_decl(decl_id) {
                     if decl.is_alias() {
-                        if let Some(alias_origin) = decl.get_alias() {
+                        if let Some(alias_origin) = decl.get_alias_ref() {
                             stack.push(alias_origin);
                         }
                     }
diff --git a/crates/emmylua_code_analysis/src/diagnostic/lua_diagnostic_code.rs b/crates/emmylua_code_analysis/src/diagnostic/lua_diagnostic_code.rs
@@ -109,6 +109,7 @@ pub fn get_default_severity(code: DiagnosticCode) -> DiagnosticSeverity {
         DiagnosticCode::InjectFieldFail => DiagnosticSeverity::ERROR,
         DiagnosticCode::UnreachableCode => DiagnosticSeverity::HINT,
         DiagnosticCode::Unused => DiagnosticSeverity::HINT,
+        DiagnosticCode::UndefinedGlobal => DiagnosticSeverity::ERROR,
         DiagnosticCode::Deprecated => DiagnosticSeverity::HINT,
         DiagnosticCode::AccessInvisible => DiagnosticSeverity::WARNING,
         DiagnosticCode::DiscardReturns => DiagnosticSeverity::WARNING,
diff --git a/crates/emmylua_code_analysis/src/semantic/type_check/ref_type.rs b/crates/emmylua_code_analysis/src/semantic/type_check/ref_type.rs
@@ -178,11 +178,12 @@ pub fn check_ref_type_compact(
                     {
                         let is_match = enum_fields.get_types().iter().all(|field| {
                             let next_guard = check_guard.next_level();
-                            if next_guard.is_err() {
-                                return false;
+                            match next_guard {
+                                Ok(guard) => {
+                                    check_general_type_compact(db, &source, field, guard).is_ok()
+                                }
+                                Err(_) => return false,
                             }
-                            check_general_type_compact(db, &source, field, next_guard.unwrap())
-                                .is_ok()
                         });
                         if is_match {
                             return Ok(());
diff --git a/crates/emmylua_code_analysis/src/semantic/type_check/simple_type.rs b/crates/emmylua_code_analysis/src/semantic/type_check/simple_type.rs
@@ -230,7 +230,7 @@ fn get_alias_real_type<'a>(db: &'a DbIndex, compact_type: &'a LuaType) -> Option
         LuaType::Ref(type_decl_id) => {
             let type_decl = db.get_type_index().get_type_decl(type_decl_id)?;
             if type_decl.is_alias() {
-                return get_alias_real_type(db, type_decl.get_alias()?);
+                return get_alias_real_type(db, type_decl.get_alias_ref()?);
             }
             Some(compact_type)
         }
@@ -250,10 +250,10 @@ fn check_base_type_for_ref_compact(
             LuaType::MultiLineUnion(multi_line_union) => {
                 if multi_line_union.get_unions().iter().all(|(t, _)| {
                     let next_guard = check_guard.next_level();
-                    if next_guard.is_err() {
-                        return false;
+                    match next_guard {
+                        Ok(guard) => check_general_type_compact(db, source, t, guard).is_ok(),
+                        Err(_) => return false,
                     }
-                    check_general_type_compact(db, source, t, next_guard.unwrap()).is_ok()
                 }) {
                     return Ok(());
                 }
@@ -291,10 +291,10 @@ fn check_enum_fields_match_source(
         if let Some(LuaType::Union(enum_fields)) = decl.get_enum_field_type(db) {
             let is_match = enum_fields.get_types().iter().all(|field| {
                 let next_guard = check_guard.next_level();
-                if next_guard.is_err() {
-                    return false;
+                match next_guard {
+                    Ok(guard) => check_general_type_compact(db, source, field, guard).is_ok(),
+                    Err(_) => return false,
                 }
-                check_general_type_compact(db, source, field, next_guard.unwrap()).is_ok()
             });
             if is_match {
                 return Ok(());

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,10 @@ impl<'a> VarTrace<'a> {`
`92`	`92`	`old_info.1.add_trace_info(trace_info);`
`93`	`93`	`} else {`
`94`	`94`	`let trace_info = UnResolveTraceInfo::Trace(trace_info);`
`95`		`- self.unresolve_traces`
`96`		`- .insert(trace_id, (self.current_flow_id.unwrap(), trace_info));`
	`95`	`+ if let Some(flow_id) = self.current_flow_id {`
	`96`	`+ self.unresolve_traces`
	`97`	`+ .insert(trace_id, (flow_id, trace_info));`
	`98`	`+ }`
`97`	`99`	`}`
`98`	`100`	`}`
`99`	`101`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ fn default_true() -> bool {`
`5`	`5`	`true`
`6`	`6`	`}`
`7`	`7`
	`8`	`+#[allow(dead_code)]`
`8`	`9`	`fn default_false() -> bool {`
`9`	`10`	`false`
`10`	`11`	`}`
`@@ -18,7 +19,7 @@ pub struct EmmyrcStrict {`
`18`	`19`	`#[serde(default)]`
`19`	`20`	`pub type_call: bool,`
`20`	`21`	`/// Whether to enable strict mode array indexing.`
`21`		`- #[serde(default = "default_false")]`
	`22`	`+ #[serde(default = "default_true")]`
`22`	`23`	`pub array_index: bool,`
`23`	`24`	`/// meta define overrides file define`
`24`	`25`	`#[serde(default = "default_true")]`
`@@ -30,7 +31,7 @@ impl Default for EmmyrcStrict {`
`30`	`31`	`Self {`
`31`	`32`	`require_path: false,`
`32`	`33`	`type_call: false,`
`33`		`- array_index: false,`
	`34`	`+ array_index: true,`
`34`	`35`	`meta_override_file_define: true,`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ impl LuaTypeDecl {`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`- pub fn get_alias(&self) -> Option<&LuaType> {`
	`150`	`+ pub fn get_alias_ref(&self) -> Option<&LuaType> {`
`151`	`151`	`match &self.extra {`
`152`	`152`	`LuaTypeExtra::Alias { origin, .. } => origin.as_ref(),`
`153`	`153`	`_ => None,`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ fn is_nullable(db: &DbIndex, typ: &LuaType) -> bool {`
`254`	`254`	`LuaType::Ref(decl_id) => {`
`255`	`255`	`if let Some(decl) = db.get_type_index().get_type_decl(decl_id) {`
`256`	`256`	`if decl.is_alias() {`
`257`		`- if let Some(alias_origin) = decl.get_alias() {`
	`257`	`+ if let Some(alias_origin) = decl.get_alias_ref() {`
`258`	`258`	`stack.push(alias_origin);`
`259`	`259`	`}`
`260`	`260`	`}`