From 8c8a5ad27586df3e938959b114a4ebdc2423428c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 31 Jan 2024 11:05:22 -0500
Subject: [PATCH] Make theme parsing more lenient (#7154)

This PR improves the theme parsing to be a bit more lenient, allowing
things like comments and trailing commas in theme files.

Release Notes:

- N/A
---
 Cargo.lock                   | 1 +
 Cargo.toml                   | 1 +
 crates/settings/Cargo.toml   | 2 +-
 crates/theme/Cargo.toml      | 1 +
 crates/theme/src/registry.rs | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00917fb3dd..ae9cf8525d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8183,6 +8183,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "serde_json_lenient",
  "serde_repr",
  "settings",
  "story",
diff --git a/Cargo.toml b/Cargo.toml
index b423969259..ffb1ef5328 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -120,6 +120,7 @@ schemars = "0.8"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
 serde_repr = "0.1"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index 5e93189a23..2d0669cada 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -27,7 +27,7 @@ schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-serde_json_lenient = {version = "0.1", features = ["preserve_order", "raw_value"] }
+serde_json_lenient.workspace = true
 smallvec.workspace = true
 toml.workspace = true
 tree-sitter-json = "*"
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index d459661706..b29ac5d2fe 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -34,6 +34,7 @@ schemars = { workspace = true, features = ["indexmap"] }
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+serde_json_lenient.workspace = true
 serde_repr.workspace = true
 settings = { path = "../settings" }
 story = { path = "../story", optional = true }
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index b5f1500429..2bbb5c6120 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -259,7 +259,7 @@ impl ThemeRegistry {
                 continue;
             };
 
-            let Some(theme) = serde_json::from_reader(reader).log_err() else {
+            let Some(theme) = serde_json_lenient::from_reader(reader).log_err() else {
                 continue;
             };