From 3c42dfd42b532dba15c191316fe3fc1fc7c69ee6 Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:19:32 -0800
Subject: [PATCH] [internal] Tweak jsonc formatting

---
 .vscode/settings.json | 10 ++++++++++
 biome.json            |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 494c758e0c..ff8461dcf0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,6 +17,16 @@
   "zig.buildFilePath": "${workspaceFolder}/build.zig",
   "zig.initialSetupDone": true,
   "editor.formatOnSave": true,
+
+  // We are using biome instead of prettier.
+  "prettier.enable": false,
+
+  "[json]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
   "[zig]": {
     "editor.tabSize": 4,
     "editor.useTabStops": false,
diff --git a/biome.json b/biome.json
index 1c4bd8ebd2..21bfceb17b 100644
--- a/biome.json
+++ b/biome.json
@@ -22,6 +22,10 @@
   "json": {
     "formatter": {
       "indentStyle": "space"
+    },
+    "parser": {
+      "allowComments": true,
+      "allowTrailingCommas": true
     }
   },
   "vcs": {