From 5360c0ea285329e0a79a6e214b6aa82725ac9165 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 2 Feb 2024 12:09:05 -0500
Subject: [PATCH] theme_importer: Make VS Code theme parsing more lenient
 (#7292)

This PR updates the `theme_importer` to use `serde_json_lenient` to
parse VS Code themes.

This should allow us to parse themes that have trailing commas and such,
in addition to the comment support that we already had.

Release Notes:

- N/A
---
 Cargo.lock                        | 8 +-------
 crates/theme_importer/Cargo.toml  | 2 +-
 crates/theme_importer/src/main.rs | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5751e0560..6500eacea5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3867,12 +3867,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json_comments"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbbfed4e59ba9750e15ba154fdfd9329cee16ff3df539c2666b70f58cc32105"
-
 [[package]]
 name = "jwt"
 version = "0.16.0"
@@ -8228,7 +8222,6 @@ dependencies = [
  "gpui",
  "indexmap 1.9.3",
  "indoc",
- "json_comments",
  "log",
  "palette",
  "pathfinder_color",
@@ -8236,6 +8229,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
+ "serde_json_lenient",
  "simplelog",
  "strum",
  "theme",
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
index 2214af85c7..ddb9433f16 100644
--- a/crates/theme_importer/Cargo.toml
+++ b/crates/theme_importer/Cargo.toml
@@ -13,7 +13,6 @@ convert_case = "0.6.0"
 gpui = { path = "../gpui" }
 indexmap = { version = "1.6.2", features = ["serde"] }
 indoc.workspace = true
-json_comments = "0.2.2"
 log.workspace = true
 palette = { version = "0.7.3", default-features = false, features = ["std"] }
 pathfinder_color = "0.5"
@@ -21,6 +20,7 @@ rust-embed.workspace = true
 schemars = { workspace = true, features = ["indexmap"] }
 serde.workspace = true
 serde_json.workspace = true
+serde_json_lenient.workspace = true
 simplelog = "0.9"
 strum = { version = "0.25.0", features = ["derive"] }
 theme = { path = "../theme" }
diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs
index a8cc8a1bdf..c689d7f7f9 100644
--- a/crates/theme_importer/src/main.rs
+++ b/crates/theme_importer/src/main.rs
@@ -9,7 +9,6 @@ use std::path::PathBuf;
 use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
 use indexmap::IndexMap;
-use json_comments::StripComments;
 use log::LevelFilter;
 use schemars::schema_for;
 use serde::Deserialize;
@@ -132,8 +131,7 @@ fn main() -> Result<()> {
         }
     };
 
-    let theme_without_comments = StripComments::new(theme_file);
-    let vscode_theme: VsCodeTheme = serde_json::from_reader(theme_without_comments)
+    let vscode_theme: VsCodeTheme = serde_json_lenient::from_reader(theme_file)
         .context(format!("failed to parse theme {theme_file_path:?}"))?;
 
     let theme_metadata = ThemeMetadata {