From ab6b9196e1696b740849dead3c406589fa81cfaa Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 15 Feb 2024 21:54:43 -0500
Subject: [PATCH] Fix `Cargo.toml` formatting (#7886)

This PR disables the formatting for `.toml` files within the Zed repo,
as the formatter provided by the TOML language server messes things up.

Release Notes:

- N/A
---
 .zed/settings.json       |   7 +-
 Cargo.toml               | 190 +++++++++++++++++++--------------------
 crates/collab/Cargo.toml |  22 ++---
 3 files changed, 100 insertions(+), 119 deletions(-)

diff --git a/.zed/settings.json b/.zed/settings.json
index 8cf61a17bd..3f3e4491c3 100644
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -1,6 +1,9 @@
 {
-  "JSON": {
-    "tab_size": 4
+  "languages": {
+    "TOML": {
+      "formatter": "prettier",
+      "format_on_save": "off"
+    }
   },
   "formatter": "auto"
 }
diff --git a/Cargo.toml b/Cargo.toml
index b155bf2232..16a9dd6666 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,91 +1,91 @@
 [workspace]
 members = [
-  "crates/activity_indicator",
-  "crates/ai",
-  "crates/assets",
-  "crates/assistant",
-  "crates/audio",
-  "crates/auto_update",
-  "crates/breadcrumbs",
-  "crates/call",
-  "crates/channel",
-  "crates/cli",
-  "crates/client",
-  "crates/clock",
-  "crates/collab",
-  "crates/collab_ui",
-  "crates/collections",
-  "crates/command_palette",
-  "crates/copilot",
-  "crates/copilot_ui",
-  "crates/db",
-  "crates/diagnostics",
-  "crates/editor",
-  "crates/extension",
-  "crates/extensions_ui",
-  "crates/feature_flags",
-  "crates/feedback",
-  "crates/file_finder",
-  "crates/fs",
-  "crates/fsevent",
-  "crates/fuzzy",
-  "crates/git",
-  "crates/go_to_line",
-  "crates/gpui",
-  "crates/gpui_macros",
-  "crates/install_cli",
-  "crates/journal",
-  "crates/language",
-  "crates/language_selector",
-  "crates/language_tools",
-  "crates/live_kit_client",
-  "crates/live_kit_server",
-  "crates/lsp",
-  "crates/markdown_preview",
-  "crates/media",
-  "crates/menu",
-  "crates/multi_buffer",
-  "crates/node_runtime",
-  "crates/notifications",
-  "crates/outline",
-  "crates/picker",
-  "crates/plugin",
-  "crates/plugin_macros",
-  "crates/prettier",
-  "crates/project",
-  "crates/project_panel",
-  "crates/project_symbols",
-  "crates/quick_action_bar",
-  "crates/recent_projects",
-  "crates/refineable",
-  "crates/refineable/derive_refineable",
-  "crates/release_channel",
-  "crates/rich_text",
-  "crates/rope",
-  "crates/rpc",
-  "crates/search",
-  "crates/semantic_index",
-  "crates/settings",
-  "crates/snippet",
-  "crates/sqlez",
-  "crates/sqlez_macros",
-  "crates/story",
-  "crates/storybook",
-  "crates/sum_tree",
-  "crates/terminal",
-  "crates/terminal_view",
-  "crates/text",
-  "crates/theme",
-  "crates/theme_importer",
-  "crates/theme_selector",
-  "crates/ui",
-  "crates/util",
-  "crates/vcs_menu",
-  "crates/vim",
-  "crates/welcome",
-  "crates/workspace",
-  "crates/zed",
-  "crates/zed_actions",
+    "crates/activity_indicator",
+    "crates/ai",
+    "crates/assets",
+    "crates/assistant",
+    "crates/audio",
+    "crates/auto_update",
+    "crates/breadcrumbs",
+    "crates/call",
+    "crates/channel",
+    "crates/cli",
+    "crates/client",
+    "crates/clock",
+    "crates/collab",
+    "crates/collab_ui",
+    "crates/collections",
+    "crates/command_palette",
+    "crates/copilot",
+    "crates/copilot_ui",
+    "crates/db",
+    "crates/diagnostics",
+    "crates/editor",
+    "crates/extension",
+    "crates/extensions_ui",
+    "crates/feature_flags",
+    "crates/feedback",
+    "crates/file_finder",
+    "crates/fs",
+    "crates/fsevent",
+    "crates/fuzzy",
+    "crates/git",
+    "crates/go_to_line",
+    "crates/gpui",
+    "crates/gpui_macros",
+    "crates/install_cli",
+    "crates/journal",
+    "crates/language",
+    "crates/language_selector",
+    "crates/language_tools",
+    "crates/live_kit_client",
+    "crates/live_kit_server",
+    "crates/lsp",
+    "crates/markdown_preview",
+    "crates/media",
+    "crates/menu",
+    "crates/multi_buffer",
+    "crates/node_runtime",
+    "crates/notifications",
+    "crates/outline",
+    "crates/picker",
+    "crates/plugin",
+    "crates/plugin_macros",
+    "crates/prettier",
+    "crates/project",
+    "crates/project_panel",
+    "crates/project_symbols",
+    "crates/quick_action_bar",
+    "crates/recent_projects",
+    "crates/refineable",
+    "crates/refineable/derive_refineable",
+    "crates/release_channel",
+    "crates/rich_text",
+    "crates/rope",
+    "crates/rpc",
+    "crates/search",
+    "crates/semantic_index",
+    "crates/settings",
+    "crates/snippet",
+    "crates/sqlez",
+    "crates/sqlez_macros",
+    "crates/story",
+    "crates/storybook",
+    "crates/sum_tree",
+    "crates/terminal",
+    "crates/terminal_view",
+    "crates/text",
+    "crates/theme",
+    "crates/theme_importer",
+    "crates/theme_selector",
+    "crates/ui",
+    "crates/util",
+    "crates/vcs_menu",
+    "crates/vim",
+    "crates/welcome",
+    "crates/workspace",
+    "crates/zed",
+    "crates/zed_actions",
 ]
 default-members = ["crates/zed"]
 resolver = "2"
@@ -190,10 +190,7 @@ git2 = { version = "0.15", default-features = false }
 globset = "0.4"
 indoc = "1"
 # We explicitly disable a http2 support in isahc.
-isahc = { version = "1.7.2", default-features = false, features = [
-  "static-curl",
-  "text-decoding",
-] }
+isahc = { version = "1.7.2", default-features = false, features = ["static-curl", "text-decoding"] }
 lazy_static = "1.4.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 ordered-float = "2.1.1"
@@ -208,14 +205,11 @@ regex = "1.5"
 rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
 rust-embed = { version = "8.0", features = ["include-exclude"] }
 schemars = "0.8"
-semver = { version = "1.0" }
+semver = "1.0"
 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_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
 serde_repr = "0.1"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
@@ -224,11 +218,7 @@ sysinfo = "0.29.10"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
 tiktoken-rs = "0.5.7"
-time = { version = "0.3", features = [
-  "serde",
-  "serde-well-known",
-  "formatting",
-] }
+time = { version = "0.3", features = ["serde", "serde-well-known", "formatting"] }
 toml = "0.5"
 tree-sitter = { version = "0.20", features = ["wasm"] }
 tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" }
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 6c9e07f3be..8beb83518b 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -15,11 +15,11 @@ name = "seed"
 required-features = ["seed-support"]
 
 [dependencies]
-axum = { version = "0.5", features = ["json", "headers", "ws"] }
 anyhow.workspace = true
+async-tungstenite = "0.16"
 aws-config = { version = "1.1.5" }
 aws-sdk-s3 = { version = "1.15.0" }
-async-tungstenite = "0.16"
+axum = { version = "0.5", features = ["json", "headers", "ws"] }
 axum-extra = { version = "0.3", features = ["erased-json"] }
 base64 = "0.13"
 chrono.workspace = true
@@ -42,26 +42,14 @@ rand.workspace = true
 reqwest = { version = "0.11", features = ["json"], optional = true }
 rpc.workspace = true
 scrypt = "0.7"
-sea-orm = { version = "0.12.x", features = [
-  "sqlx-postgres",
-  "postgres-array",
-  "runtime-tokio-rustls",
-  "with-uuid",
-] }
+sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 semver.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 sha-1 = "0.9"
 smallvec.workspace = true
-sqlx = { version = "0.7", features = [
-  "runtime-tokio-rustls",
-  "postgres",
-  "json",
-  "time",
-  "uuid",
-  "any",
-] }
+sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
 text.workspace = true
 time.workspace = true
 tokio = { version = "1", features = ["full"] }
@@ -76,7 +64,6 @@ util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-release_channel.workspace = true
 async-trait.workspace = true
 audio.workspace = true
 call = { workspace = true, features = ["test-support"] }
@@ -101,6 +88,7 @@ node_runtime.workspace = true
 notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
+release_channel.workspace = true
 rpc = { workspace = true, features = ["test-support"] }
 sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
 serde_json.workspace = true