From 146b9c232c3444667c118d3c5513991c63ad4f58 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Fri, 7 Feb 2025 19:17:17 -0700
Subject: [PATCH] Sort and dedupe .gitignore files (#24491)

Release Notes:

- N/A
---
 .gitignore                  | 47 ++++++++++++++++++-------------------
 extensions/emmet/.gitignore |  2 +-
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8e2e1e8b67699be4ab98f7568886d7a19dcb276..99a6184f564ead8b08e50248e42c945b4328ca52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,35 @@
-/.direnv
-.envrc
-.idea
-**/target
+**/*.db
 **/cargo-target
-/zed.xcworkspace
-.DS_Store
-/plugins/bin
-/script/node_modules
-/crates/theme/schemas/theme.json
-/crates/collab/seed.json
-/crates/zed/resources/flatpak/flatpak-cargo-sources.json
-/dev.zed.Zed*.json
-/assets/*licenses.*
+**/target
 **/venv
-.build
 *.wasm
-Packages
 *.xcodeproj
-xcuserdata/
-DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.DS_Store
+.blob_store
+.build
+.envrc
+.flatpak-builder
+.idea
 .netrc
-.swiftpm
-**/*.db
 .pytest_cache
+.swiftpm
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .venv
-.blob_store
 .vscode
 .wrangler
-.flatpak-builder
-.envrc
+/.direnv
+/assets/*licenses.*
+/crates/collab/seed.json
+/crates/theme/schemas/theme.json
+/crates/zed/resources/flatpak/flatpak-cargo-sources.json
+/dev.zed.Zed*.json
+/plugins/bin
+/script/node_modules
+/zed.xcworkspace
+DerivedData/
+Packages
+xcuserdata/
 
 # Don't commit any secrets to the repo.
 .env.secret.toml
diff --git a/extensions/emmet/.gitignore b/extensions/emmet/.gitignore
index 6aba30215ee94f1b5af1ca029da3056fe1062781..62c0add260e0ad28057d36f9575ef66e430a5a20 100644
--- a/extensions/emmet/.gitignore
+++ b/extensions/emmet/.gitignore
@@ -1,3 +1,3 @@
-target
 *.wasm
 grammars
+target