From c4f8f2fbf4b68c6f39279fc99ef8ceea74891588 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 18 Dec 2025 00:22:37 +0200
Subject: [PATCH] Use less generic globs for JSONC to avoid overmatching
 (#45162)

Otherwise, all *.json files under `zed` directory will be matched as
JSONC, e.g `zed/crates/vim/test_data/test_a.json` which is not right.
On top, `globset` considers that `zed/crates/vim/test_data/test_a.json`
matches `**/zed/*.json` glob (!).

Release Notes:

- N/A
---
 assets/settings/default.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index a0280b402a0d5c6b71aca296021cc7f43c222521..e7df5ef0bf2d3bc805c79f79811d9929343544ef 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1705,7 +1705,12 @@
   // }
   //
   "file_types": {
-    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json", "tsconfig*.json"],
+    "JSONC": [
+      "**/.zed/*.json",
+      "**/.vscode/**/*.json",
+      "**/{zed,Zed}/{settings,keymap,tasks,debug}.json",
+      "tsconfig*.json",
+    ],
     "Markdown": [".rules", ".cursorrules", ".windsurfrules", ".clinerules"],
     "Shell Script": [".env.*"],
   },