zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix Cargo.toml formatting (#7886)

Browse Source 
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
This commit is contained in:
Marshall Bowers 2024-02-15 21:54:43 -05:00 committed by GitHub
parent ef551cedef
commit ab6b9196e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 100 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.zed/settings.json
View File

@ -1,6 +1,9 @@
{ {
"JSON": { "languages": {
"tab_size": 4 "TOML": {
"formatter": "prettier",
"format_on_save": "off"
}
}, },
"formatter": "auto" "formatter": "auto"
} }

190
Cargo.toml
View File

@ -1,91 +1,91 @@
[workspace] [workspace]
members = [ members = [
"crates/activity_indicator", "crates/activity_indicator",
"crates/ai", "crates/ai",
"crates/assets", "crates/assets",
"crates/assistant", "crates/assistant",
"crates/audio", "crates/audio",
"crates/auto_update", "crates/auto_update",
"crates/breadcrumbs", "crates/breadcrumbs",
"crates/call", "crates/call",
"crates/channel", "crates/channel",
"crates/cli", "crates/cli",
"crates/client", "crates/client",
"crates/clock", "crates/clock",
"crates/collab", "crates/collab",
"crates/collab_ui", "crates/collab_ui",
"crates/collections", "crates/collections",
"crates/command_palette", "crates/command_palette",
"crates/copilot", "crates/copilot",
"crates/copilot_ui", "crates/copilot_ui",
"crates/db", "crates/db",
"crates/diagnostics", "crates/diagnostics",
"crates/editor", "crates/editor",
"crates/extension", "crates/extension",
"crates/extensions_ui", "crates/extensions_ui",
"crates/feature_flags", "crates/feature_flags",
"crates/feedback", "crates/feedback",
"crates/file_finder", "crates/file_finder",
"crates/fs", "crates/fs",
"crates/fsevent", "crates/fsevent",
"crates/fuzzy", "crates/fuzzy",
"crates/git", "crates/git",
"crates/go_to_line", "crates/go_to_line",
"crates/gpui", "crates/gpui",
"crates/gpui_macros", "crates/gpui_macros",
"crates/install_cli", "crates/install_cli",
"crates/journal", "crates/journal",
"crates/language", "crates/language",
"crates/language_selector", "crates/language_selector",
"crates/language_tools", "crates/language_tools",
"crates/live_kit_client", "crates/live_kit_client",
"crates/live_kit_server", "crates/live_kit_server",
"crates/lsp", "crates/lsp",
"crates/markdown_preview", "crates/markdown_preview",
"crates/media", "crates/media",
"crates/menu", "crates/menu",
"crates/multi_buffer", "crates/multi_buffer",
"crates/node_runtime", "crates/node_runtime",
"crates/notifications", "crates/notifications",
"crates/outline", "crates/outline",
"crates/picker", "crates/picker",
"crates/plugin", "crates/plugin",
"crates/plugin_macros", "crates/plugin_macros",
"crates/prettier", "crates/prettier",
"crates/project", "crates/project",
"crates/project_panel", "crates/project_panel",
"crates/project_symbols", "crates/project_symbols",
"crates/quick_action_bar", "crates/quick_action_bar",
"crates/recent_projects", "crates/recent_projects",
"crates/refineable", "crates/refineable",
"crates/refineable/derive_refineable", "crates/refineable/derive_refineable",
"crates/release_channel", "crates/release_channel",
"crates/rich_text", "crates/rich_text",
"crates/rope", "crates/rope",
"crates/rpc", "crates/rpc",
"crates/search", "crates/search",
"crates/semantic_index", "crates/semantic_index",
"crates/settings", "crates/settings",
"crates/snippet", "crates/snippet",
"crates/sqlez", "crates/sqlez",
"crates/sqlez_macros", "crates/sqlez_macros",
"crates/story", "crates/story",
"crates/storybook", "crates/storybook",
"crates/sum_tree", "crates/sum_tree",
"crates/terminal", "crates/terminal",
"crates/terminal_view", "crates/terminal_view",
"crates/text", "crates/text",
"crates/theme", "crates/theme",
"crates/theme_importer", "crates/theme_importer",
"crates/theme_selector", "crates/theme_selector",
"crates/ui", "crates/ui",
"crates/util", "crates/util",
"crates/vcs_menu", "crates/vcs_menu",
"crates/vim", "crates/vim",
"crates/welcome", "crates/welcome",
"crates/workspace", "crates/workspace",
"crates/zed", "crates/zed",
"crates/zed_actions", "crates/zed_actions",
] ]
default-members = ["crates/zed"] default-members = ["crates/zed"]
resolver = "2" resolver = "2"
@ -190,10 +190,7 @@ git2 = { version = "0.15", default-features = false }
globset = "0.4" globset = "0.4"
indoc = "1" indoc = "1"
# We explicitly disable a http2 support in isahc. # We explicitly disable a http2 support in isahc.
isahc = { version = "1.7.2", default-features = false, features = [ isahc = { version = "1.7.2", default-features = false, features = ["static-curl", "text-decoding"] }
"static-curl",
"text-decoding",
] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }
ordered-float = "2.1.1" ordered-float = "2.1.1"
@ -208,14 +205,11 @@ regex = "1.5"
rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] } rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
rust-embed = { version = "8.0", features = ["include-exclude"] } rust-embed = { version = "8.0", features = ["include-exclude"] }
schemars = "0.8" schemars = "0.8"
semver = { version = "1.0" } semver = "1.0"
serde = { version = "1.0", features = ["derive", "rc"] } serde = { version = "1.0", features = ["derive", "rc"] }
serde_derive = { version = "1.0", features = ["deserialize_in_place"] } serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] } serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
serde_json_lenient = { version = "0.1", features = [ serde_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
"preserve_order",
"raw_value",
] }
serde_repr = "0.1" serde_repr = "0.1"
smallvec = { version = "1.6", features = ["union"] } smallvec = { version = "1.6", features = ["union"] }
smol = "1.2" smol = "1.2"
@ -224,11 +218,7 @@ sysinfo = "0.29.10"
tempfile = "3.9.0" tempfile = "3.9.0"
thiserror = "1.0.29" thiserror = "1.0.29"
tiktoken-rs = "0.5.7" tiktoken-rs = "0.5.7"
time = { version = "0.3", features = [ time = { version = "0.3", features = ["serde", "serde-well-known", "formatting"] }
"serde",
"serde-well-known",
"formatting",
] }
toml = "0.5" toml = "0.5"
tree-sitter = { version = "0.20", features = ["wasm"] } tree-sitter = { version = "0.20", features = ["wasm"] }
tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" } tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" }

22
crates/collab/Cargo.toml
View File

@ -15,11 +15,11 @@ name = "seed"
required-features = ["seed-support"] required-features = ["seed-support"]
[dependencies] [dependencies]
axum = { version = "0.5", features = ["json", "headers", "ws"] }
anyhow.workspace = true anyhow.workspace = true
async-tungstenite = "0.16"
aws-config = { version = "1.1.5" } aws-config = { version = "1.1.5" }
aws-sdk-s3 = { version = "1.15.0" } 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"] } axum-extra = { version = "0.3", features = ["erased-json"] }
base64 = "0.13" base64 = "0.13"
chrono.workspace = true chrono.workspace = true
@ -42,26 +42,14 @@ rand.workspace = true
reqwest = { version = "0.11", features = ["json"], optional = true } reqwest = { version = "0.11", features = ["json"], optional = true }
rpc.workspace = true rpc.workspace = true
scrypt = "0.7" scrypt = "0.7"
sea-orm = { version = "0.12.x", features = [ sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
"sqlx-postgres",
"postgres-array",
"runtime-tokio-rustls",
"with-uuid",
] }
semver.workspace = true semver.workspace = true
serde.workspace = true serde.workspace = true
serde_derive.workspace = true serde_derive.workspace = true
serde_json.workspace = true serde_json.workspace = true
sha-1 = "0.9" sha-1 = "0.9"
smallvec.workspace = true smallvec.workspace = true
sqlx = { version = "0.7", features = [ sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
"runtime-tokio-rustls",
"postgres",
"json",
"time",
"uuid",
"any",
] }
text.workspace = true text.workspace = true
time.workspace = true time.workspace = true
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }
@ -76,7 +64,6 @@ util.workspace = true
uuid.workspace = true uuid.workspace = true
[dev-dependencies] [dev-dependencies]
release_channel.workspace = true
async-trait.workspace = true async-trait.workspace = true
audio.workspace = true audio.workspace = true
call = { workspace = true, features = ["test-support"] } call = { workspace = true, features = ["test-support"] }
@ -101,6 +88,7 @@ node_runtime.workspace = true
notifications = { workspace = true, features = ["test-support"] } notifications = { workspace = true, features = ["test-support"] }
pretty_assertions.workspace = true pretty_assertions.workspace = true
project = { workspace = true, features = ["test-support"] } project = { workspace = true, features = ["test-support"] }
release_channel.workspace = true
rpc = { workspace = true, features = ["test-support"] } rpc = { workspace = true, features = ["test-support"] }
sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] } sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
serde_json.workspace = true serde_json.workspace = true