refactor about config

Author: CppCXY

Cargo.lock

@@ -32,3 +32,4 @@ encoding_rs = "0.8"
 url = "2.5.2"
 smol_str = "0.3.2"
 tera = "1.20.0"
+serde_with = "3.12.0"

Cargo.toml

@@ -25,6 +25,7 @@ flagset.workspace = true
 encoding_rs.workspace = true
 url.workspace = true
 smol_str.workspace = true
+serde_with.workspace = true
 
 [package.metadata.i18n]
 available-locales = ["en", "zh_CN", "zh_HK", "zh_TW"]

crates/code_analysis/Cargo.toml

@@ -4,7 +4,7 @@ use serde_json::Value;
 
 use super::{flatten_config::FlattenConfigObject, Emmyrc};
 
-pub fn load_configs(config_files: Vec<PathBuf>) -> Emmyrc {
+pub fn load_configs(config_files: Vec<PathBuf>, partial_emmyrcs: Option<Vec<Value>>) -> Emmyrc {
     let mut config_jsons = Vec::new();
     for config_file in config_files {
         let config_json_str = match std::fs::read_to_string(&config_file) {
@@ -33,6 +33,12 @@ pub fn load_configs(config_files: Vec<PathBuf>) -> Emmyrc {
         config_jsons.push(config_json);
     }
 
+    if let Some(partial_emmyrcs) = partial_emmyrcs {
+        for partial_emmyrc in partial_emmyrcs {
+            config_jsons.push(partial_emmyrc);
+        }
+    }
+
     if config_jsons.is_empty() {
         log::info!("No valid config file found.");
         Emmyrc::default()

crates/code_analysis/src/config/config_loader.rs

@@ -1,5 +1,8 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, DefaultOnError};
+
+#[serde_as]
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 /// Configuration for EmmyLua code completion.
@@ -18,6 +21,7 @@ pub struct EmmyrcCompletion {
     pub auto_require_naming_convention: EmmyrcFilenameConvention,
     /// Whether to use call snippets in completions.
     #[serde(default)]
+    #[serde_as(deserialize_as = "DefaultOnError")]
     pub call_snippet: bool,
     /// The postfix trigger used in completions.
     #[serde(default = "default_postfix")]
@@ -67,4 +71,3 @@ impl Default for EmmyrcFilenameConvention {
         EmmyrcFilenameConvention::Keep
     }
 }
-