Refactor strict configuration: rename doc_integer_const_match_int to doc_base_const_match_base_type .

Author: xuhuanzy

crates/emmylua_code_analysis/resources/schema.json

@@ -159,7 +159,7 @@
     "strict": {
       "default": {
         "arrayIndex": true,
-        "docIntegerConstMatchInt": true,
+        "docBaseConstMatchBaseType": true,
         "metaOverrideFileDefine": true,
         "requirePath": false,
         "typeCall": false
@@ -925,8 +925,8 @@
           "default": true,
           "type": "boolean"
         },
-        "docIntegerConstMatchInt": {
-          "description": "`doc_integer_const` type can match `int` type.",
+        "docBaseConstMatchBaseType": {
+          "description": "Base constant types defined in doc can match base types, allowing int to match `---@alias id 1|2|3`, same for string.",
           "default": false,
           "type": "boolean"
         },

crates/emmylua_code_analysis/src/config/configs/strict.rs

@@ -24,9 +24,9 @@ pub struct EmmyrcStrict {
     /// meta define overrides file define
     #[serde(default = "default_true")]
     pub meta_override_file_define: bool,
-    /// `doc_integer_const` type can match `int` type.
+    /// Base constant types defined in doc can match base types, allowing int to match `---@alias id 1|2|3`, same for string.
     #[serde(default = "default_false")]
-    pub doc_integer_const_match_int: bool,
+    pub doc_base_const_match_base_type: bool,
 }
 
 impl Default for EmmyrcStrict {
@@ -36,7 +36,7 @@ impl Default for EmmyrcStrict {
             type_call: false,
             array_index: true,
             meta_override_file_define: true,
-            doc_integer_const_match_int: true,
+            doc_base_const_match_base_type: true,
         }
     }
 }

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

@@ -1024,7 +1024,7 @@ mod test {
     fn test_int_to_alias() {
         let mut ws = VirtualWorkspace::new();
         let mut emmyrc = ws.analysis.get_emmyrc().deref().clone();
-        emmyrc.strict.doc_integer_const_match_int = true;
+        emmyrc.strict.doc_base_const_match_base_type = true;
         ws.analysis.update_config(Arc::new(emmyrc));
 
         assert!(ws.check_code_for(
@@ -1048,6 +1048,10 @@ mod test {
     #[test]
     fn test_enum_value_matching() {
         let mut ws = VirtualWorkspace::new();
+        let mut emmyrc = ws.analysis.get_emmyrc().deref().clone();
+        emmyrc.strict.doc_base_const_match_base_type = true;
+        ws.analysis.update_config(Arc::new(emmyrc));
+
         assert!(ws.check_code_for(
             DiagnosticCode::ParamTypeNotMatch,
             r#"

crates/emmylua_code_analysis/src/semantic/type_check/simple_type.rs

@@ -131,7 +131,7 @@ pub fn check_simple_type_compact(
                 return Err(TypeCheckFailReason::TypeNotMatch);
             }
             LuaType::Integer => {
-                if db.get_emmyrc().strict.doc_integer_const_match_int {
+                if db.get_emmyrc().strict.doc_base_const_match_base_type {
                     return Ok(());
                 }
                 return Err(TypeCheckFailReason::TypeNotMatch);
@@ -144,10 +144,12 @@ pub fn check_simple_type_compact(
                 return Err(TypeCheckFailReason::TypeNotMatch);
             }
             LuaType::Ref(_) => {
-                match check_base_type_for_ref_compact(db, source, compact_type, check_guard) {
-                    Ok(_) => return Ok(()),
-                    Err(err) if err.is_type_not_match() => {}
-                    Err(err) => return Err(err),
+                if db.get_emmyrc().strict.doc_base_const_match_base_type {
+                    match check_base_type_for_ref_compact(db, source, compact_type, check_guard) {
+                        Ok(_) => return Ok(()),
+                        Err(err) if err.is_type_not_match() => {}
+                        Err(err) => return Err(err),
+                    }
                 }
             }
             _ => {}
@@ -169,10 +171,12 @@ pub fn check_simple_type_compact(
                 return Err(TypeCheckFailReason::TypeNotMatch);
             }
             LuaType::Ref(_) => {
-                match check_base_type_for_ref_compact(db, source, compact_type, check_guard) {
-                    Ok(_) => return Ok(()),
-                    Err(err) if err.is_type_not_match() => {}
-                    Err(err) => return Err(err),
+                if db.get_emmyrc().strict.doc_base_const_match_base_type {
+                    match check_base_type_for_ref_compact(db, source, compact_type, check_guard) {
+                        Ok(_) => return Ok(()),
+                        Err(err) if err.is_type_not_match() => {}
+                        Err(err) => return Err(err),
+                    }
                 }
             }
             _ => {}