This commit is contained in:
Antonio Scandurra 2023-10-23 11:53:24 +02:00
parent 0de4a93ec7
commit c0e8ae5dfa
4 changed files with 47 additions and 52 deletions

View file

@ -1,7 +1,8 @@
use collections::HashMap;
use gpui2::AppContext;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::Setting;
use settings2::Setting;
use std::sync::Arc;
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
@ -40,7 +41,7 @@ impl Setting for ProjectSettings {
fn load(
default_value: &Self::FileContent,
user_values: &[&Self::FileContent],
_: &gpui::AppContext,
_: &AppContext,
) -> anyhow::Result<Self> {
Self::load_via_json_merge(default_value, user_values)
}