leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: return error if vscode config fails to parse, instead of overwriting

Browse source
This commit is contained in:
Ashley Wulber 2024-07-17 13:27:53 -04:00 • committed by Michael Murphy
parent 2dd55f2f20
commit cfa1adaf46
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-theme/src/output/mod.rs
View file

@ -14,6 +14,8 @@ pub enum OutputError {
Io(std::io::Error),
#[error("Missing config directory")]
MissingConfigDir,
#[error("Serde Error: {0}")]
Serde(#[from] serde_json::Error),
}
impl Theme {

2
cosmic-theme/src/output/vs_code.rs
View file

@ -277,7 +277,7 @@ impl Theme {
// just add the json entry for workbench.colorCustomizations
let settings_file = vs_code_dir.join("settings.json");
let settings = std::fs::read_to_string(&settings_file).unwrap_or_default();
let mut settings: serde_json::Value = serde_json::from_str(&settings).unwrap_or_default();
let mut settings: serde_json::Value = serde_json::from_str(&settings)?;
settings["workbench.colorCustomizations"] = serde_json::to_value(vs_theme).unwrap();
settings["window.autoDetectColorScheme"] = serde_json::Value::Bool(true);
std::fs::write(