Reduce the dependency footprint (#65176)

Follows-up https://github.com/zed-industries/zed/pull/64862 with similar
fixes:

* replaces a few dependencies that are almost not used, removes unused
dependencies
* removed unused features
* removes `test-support` dependencies from the regular tree
* cleans up build scripts

Despite the large diff, the changes are rather mechanical, split by
commits.
Result:
<img width="1172" height="77" alt="image"
src="https://github.com/user-attachments/assets/7d8aeb58-7cec-4246-8157-d07fc585f81f"
/>

Release Notes:

- N/A
- [GPUI] N/A
This commit is contained in:
Kirill Bulatov
2026-10-05 12:44:26 +00:00
committed by GitHub
parent e7c03209fc
commit d544470d1d
146 changed files with 651 additions and 971 deletions
Generated
+43 -446
View File
File diff suppressed because it is too large Load Diff
+80 -111
View File
@@ -304,7 +304,7 @@ buffer_diff = { path = "crates/buffer_diff" }
call = { path = "crates/call" }
call_hierarchy = { path = "crates/call_hierarchy" }
channel = { path = "crates/channel" }
cli = { path = "crates/cli" }
cli = { path = "crates/cli", default-features = false }
client = { path = "crates/client" }
clock = { path = "crates/clock" }
cloud_api_client = { path = "crates/cloud_api_client" }
@@ -337,7 +337,7 @@ dev_container = { path = "crates/dev_container" }
diagnostics = { path = "crates/diagnostics" }
edit_prediction = { path = "crates/edit_prediction" }
edit_prediction_context = { path = "crates/edit_prediction_context" }
edit_prediction_metrics = { path = "crates/edit_prediction_metrics" }
edit_prediction_metrics = { path = "crates/edit_prediction_metrics", features = ["tree-sitter"] }
edit_prediction_types = { path = "crates/edit_prediction_types" }
edit_prediction_ui = { path = "crates/edit_prediction_ui" }
editor = { path = "crates/editor" }
@@ -433,7 +433,7 @@ outline = { path = "crates/outline" }
outline_panel = { path = "crates/outline_panel" }
path = { path = "crates/path" }
paths = { path = "crates/paths" }
perf = { path = "tooling/perf" }
perf = { path = "tooling/perf", default-features = false }
picker = { path = "crates/picker" }
picker_preview = { path = "crates/picker_preview" }
platform_title_bar = { path = "crates/platform_title_bar" }
@@ -452,7 +452,7 @@ remote_connection = { path = "crates/remote_connection" }
remote_server = { path = "crates/remote_server" }
repl = { path = "crates/repl" }
reqwest_client = { path = "crates/reqwest_client" }
rodio = { git = "https://github.com/RustAudio/rodio", rev = "e50e726ddd0292f6ef9de0dda6b90af4ed1fb66a", default-features = false, features = ["wav", "playback", "wav_output", "recording", "dither"] }
rodio = { git = "https://github.com/RustAudio/rodio", rev = "e50e726ddd0292f6ef9de0dda6b90af4ed1fb66a", default-features = false, features = ["wav", "playback", "wav_output", "recording"] }
rope = { path = "crates/rope" }
rpc = { path = "crates/rpc" }
sandbox = { path = "crates/sandbox" }
@@ -505,6 +505,7 @@ watch = { path = "crates/watch" }
web_search = { path = "crates/web_search" }
web_search_providers = { path = "crates/web_search_providers" }
which_key = { path = "crates/which_key" }
windows_resources = { path = "crates/windows_resources" }
workspace = { path = "crates/workspace" }
worktree = { path = "crates/worktree" }
x_ai = { path = "crates/x_ai" }
@@ -535,19 +536,17 @@ arc-swap = "1.9.0"
ashpd = { version = "0.13", default-features = false, features = [
"async-io",
"inhibit",
"notification",
"open_uri",
"file_chooser",
"settings",
"trash"
"settings"
] }
async-channel = "2.5.0"
async-channel = { version = "2.5", default-features = false }
async-compat = "0.2.1"
async-compression = { version = "0.4", features = ["bzip2", "gzip", "futures-io"] }
async-dispatcher = "0.1"
async-fs = "2.1"
async-io = "2.6.0"
async-lock = "3.4.2"
async-lock = { version = "3.4", default-features = false }
async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
# `unstable` is required to compile async-tar's Windows symlink support.
async-process = "2.5.0"
@@ -571,6 +570,8 @@ aws-sdk-bedrockruntime = { version = "1.112.0", default-features = false, featur
"behavior-version-latest",
"rt-tokio",
] }
aws-sdk-kinesis = { version = "1.51", default-features = false }
aws-sdk-s3 = { version = "1.15", default-features = false }
aws-sigv4 = { version = "1.4.0", features = ["http1"] }
aws-smithy-runtime-api = { version = "1.9.2", features = ["http-1x", "client"] }
aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] }
@@ -580,17 +581,17 @@ betlang = "0.1.1"
bitflags = "2.6.0"
block2 = "0.6"
brush-parser = "0.3"
bytemuck = "1"
bytes = "1.0"
cargo_metadata = "0.19"
cargo_metadata = "0.23"
cargo_toml = "0.21"
cbindgen = { version = "0.28.0", default-features = false }
chardetng = "0.1"
chrono = { version = "0.4", features = ["serde"] }
chrono = { version = "0.4", default-features = false, features = ["std", "serde"] }
ciborium = "0.2"
circular-buffer = "1.0"
clap = { version = "4.4", features = ["derive", "wrap_help"] }
clap_complete = { version = "4.4" }
clap_complete_nushell = { version = "4.4" }
clap_complete = "4.4"
clap_complete_nushell = "4.4"
cocoa = "=0.26.0"
console = "0.16"
console_error_panic_hook = "0.1.7"
@@ -599,8 +600,10 @@ convert_case = "0.11.0"
core-foundation = "0.10"
core-foundation-sys = "0.8.6"
core-graphics = "0.24"
core-services = "1"
core-text = "21"
core-video = { version = "0.5.2", features = ["metal"] }
core-video = { version = "0.5", default-features = false, features = ["link"] }
coreaudio-rs = { version = "0.12", default-features = false }
cpal = "0.17"
crash-handler = "0.8"
criterion = { version = "0.8.2", features = ["html_reports"] }
@@ -609,22 +612,11 @@ crossbeam-queue = "0.3.12"
ctor = "1.0.12"
dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "1b461b310481d01e02b2603c16d7144b926339f8" }
dashmap = "6.0"
derive_more = { version = "2.1.1", features = [
"add",
"add_assign",
"deref",
"deref_mut",
"display",
"from",
"from_str",
"mul",
"mul_assign",
"not",
] }
derive_more = { version = "2.1", features = ["deref", "deref_mut", "from_str"] }
dialoguer = { version = "0.12", default-features = false }
diffy = "0.4.2"
dirs = "6.0"
dispatch2 = "0.3.1"
dispatch2 = { version = "0.3", default-features = false, features = ["std"] }
documented = "0.10"
dotenvy = "0.15.0"
dunce = "1.0"
@@ -635,7 +627,8 @@ env_logger = "0.11"
etagere = "0.2"
exec = "0.3.1"
fancy-regex = "0.19"
flume = "0.12"
flume = { version = "0.12", default-features = false, features = ["async"] }
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", default-features = false }
foreign-types = "0.5"
fork = "0.4.0"
futures = "0.3.34"
@@ -647,7 +640,7 @@ handlebars = "4.3"
hdrhistogram = { version = "7", default-features = false }
heapless = "0.9.2"
heck = "0.5"
heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
heed = { version = "0.21", default-features = false, features = ["read-txn-no-tls", "serde-bincode", "serde-json"] }
hex = "0.4.3"
html5ever = "0.39"
http = "1.1"
@@ -675,14 +668,15 @@ image = { version = "0.25.1", default-features = false, features = [
"tiff",
"webp",
] }
imara-diff = "0.2.0"
imara-diff = { version = "0.2", default-features = false }
indexmap = { version = "2.7.0", features = ["serde"] }
indoc = "2"
inventory = "0.3.19"
is_executable = "1.0"
itertools = "0.14.0"
js-sys = "0.3"
jsonschema = { version = "0.51", default-features = false }
jsonwebtoken = "10.0"
jsonwebtoken = { version = "10.0", default-features = false }
jupyter-protocol = "1.4.0"
jupyter-websocket-client = "1.1.0"
libc = "0.2"
@@ -690,11 +684,13 @@ libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
libwebrtc = "0.3.26"
linkify = "0.10.0"
livekit = { version = "0.7.32", features = ["tokio", "rustls-tls-native-roots"] }
log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
log = { version = "0.4", default-features = false, features = ["std"] }
lru = "0.16"
lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "f1783e63a7f4eb4397bf51d4148b4895a1f7ab16" }
mach2 = "0.5"
mach2 = "0.6"
markup5ever_rcdom = "0.39"
mdbook = { version = "=0.4.40", default-features = false, features = ["search"] }
merman = { version = "=0.8.0-alpha.5", default-features = false }
metal = "0.33"
mime = "0.3.17"
minidumper = "0.11"
@@ -703,8 +699,7 @@ nanoid = "0.4"
nbformat = "1.2.0"
nix = "0.30"
notify-rust = "4"
nucleo = "0.5"
num-format = "0.4.4"
nucleo = { package = "nucleo-matcher", version = "0.3" }
objc = "0.2"
objc2 = "0.6"
objc2-app-kit = { version = "0.3.2", default-features = false, features = [
@@ -735,7 +730,6 @@ objc2-core-video = { version = "=0.3.2", default-features = false, features = ["
objc2-foundation = { version = "=0.3.2", default-features = false, features = [
"NSArray",
"NSAttributedString",
"NSBundle",
"NSCoder",
"NSData",
"NSDate",
@@ -743,7 +737,6 @@ objc2-foundation = { version = "=0.3.2", default-features = false, features = [
"NSEnumerator",
"NSError",
"NSGeometry",
"NSNotification",
"NSNull",
"NSObjCRuntime",
"NSObject",
@@ -753,7 +746,6 @@ objc2-foundation = { version = "=0.3.2", default-features = false, features = [
"NSSet",
"NSString",
"NSURL",
"NSUndoManager",
"NSValue",
"objc2-core-foundation",
"std",
@@ -768,7 +760,20 @@ objc2-screen-capture-kit = { version = "=0.3.2", default-features = false, featu
"SCStream",
"std"
] }
objc2-user-notifications = "0.3"
objc2-user-notifications = { version = "0.3", default-features = false, features = [
"std",
"block2",
"UNNotification",
"UNNotificationAction",
"UNNotificationCategory",
"UNNotificationContent",
"UNNotificationRequest",
"UNNotificationResponse",
"UNNotificationTrigger",
"UNUserNotificationCenter",
] }
octocrab = { version = "0.49", default-features = false }
oo7 = { version = "0.6", default-features = false }
open = "5.0.0"
ordered-float = "5"
palette = { version = "0.7.5", default-features = false, features = ["std"] }
@@ -786,7 +791,8 @@ pet-poetry = { git = "https://github.com/zed-industries/python-environment-tools
pet-reporter = { git = "https://github.com/zed-industries/python-environment-tools.git", rev = "5aad7164bfc2a58977b103c8ef8fdd7302ed2e9f" }
pet-virtualenv = { git = "https://github.com/zed-industries/python-environment-tools.git", rev = "5aad7164bfc2a58977b103c8ef8fdd7302ed2e9f" }
piper = "0.2"
postage = { version = "0.5", features = ["futures-traits"] }
plist = "1.3"
postage = { version = "0.5", default-features = false }
pretty_assertions = { version = "1.3.0", features = ["unstable"] }
proc-macro2 = "1.0.93"
profiling = "1"
@@ -795,23 +801,21 @@ pollster = "0.4.0"
proptest = { git = "https://github.com/proptest-rs/proptest", rev = "3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b", features = ["attr-macro"] }
proptest-derive = "0.8.0"
prost = "0.14"
prost-build = "0.14"
prost-build = { version = "0.14", default-features = false }
prost-types = "0.14"
protox = "0.9"
proxyvars = "0.2"
pulldown-cmark = { version = "0.13.0", default-features = false }
quick-xml = "0.41"
quote = "1.0.9"
rand = "0.9"
rand = { version = "0.9", default-features = false, features = ["std", "std_rng", "os_rng"] }
raw-window-handle = "0.6"
rayon = "1.8"
regex = "1.5"
regex = { version = "1.5", default-features = false, features = ["std", "perf"] }
# WARNING: If you change this, you must also publish a new version of zed-reqwest to crates.io
reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "33bc764aa15ff7b200bf7c93bd96e24878d53e14", default-features = false, features = [
"charset",
"http2",
"macos-system-configuration",
"multipart",
"rustls-tls-native-roots",
"socks",
"stream",
@@ -822,21 +826,22 @@ resvg = { version = "0.46.0", default-features = false, features = [
"memmap-fonts",
"raster-images",
] }
rsa = "0.9.6"
rsa = { version = "0.9", default-features = false, features = ["std", "u64_digit"] }
runtimelib = { version = "1.4.0", default-features = false, features = [
"async-dispatcher-runtime", "aws-lc-rs"
] }
rust-embed = { version = "8.11", features = ["include-exclude", "compression"] }
rustc-hash = "2.1.0"
rustix = { version = "1.1", features = ["fs"] }
rustls = { version = "0.23.26" }
rustls = "0.23.26"
rustls-platform-verifier = "0.7"
# WARNING: If you change this, you must also publish a new version of zed-scap to crates.io
scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", default-features = false, package = "zed-scap", version = "0.0.8-zed" }
schemars = { version = "1.0", features = ["indexmap2"] }
schemars = { version = "1.0", default-features = false, features = ["std", "indexmap2"] }
sea-orm = { version = "=1.1.10", default-features = false }
seccompiler = "0.5"
semver = { version = "1.0", features = ["serde"] }
serde = { version = "1.0.221", features = ["derive", "rc"] }
serde = { version = "1.0", features = ["rc"] }
serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] }
serde_json_lenient = { version = "0.2", features = [
"preserve_order",
@@ -844,25 +849,30 @@ serde_json_lenient = { version = "0.2", features = [
] }
serde_path_to_error = "0.1.17"
serde_urlencoded = "0.7"
serde_yaml = "0.9.34"
serde_yaml = { package = "serde_yaml_ng", version = "0.10" }
serde_yaml_ng = "0.10"
sha2 = "0.10"
shellexpand = "3.1"
shlex = "1.3.0"
simplelog = "0.12.2"
shlex = "2.0"
similar = "2.7"
simplelog = { version = "0.12", default-features = false }
slotmap = "1.0.6"
smallvec = { version = "1.6", features = ["union", "const_new"] }
spin = { version = "0.10", default-features = false, features = ["mutex", "spin_mutex", "lock_api"] }
smol = "2.0"
sqlformat = "0.2"
sqlx = { version = "0.8", default-features = false }
stacksafe = "1.0"
streaming-iterator = "0.1"
strsim = "0.11"
strum = { version = "0.28", features = ["derive"] }
swash = "0.2.6"
syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }
syn = { version = "2.0", default-features = false, features = ["proc-macro"] }
sys-locale = "0.3.1"
sysinfo = "0.39"
sysinfo = { version = "0.39", default-features = false, features = ["system"] }
taffy = { version = "=0.13.0", default-features = false }
tempfile = "3.20.0"
tendril = "0.5"
thiserror = "2.0.12"
time = { version = "0.3", features = [
"macros",
@@ -873,17 +883,14 @@ time = { version = "0.3", features = [
"local-offset",
] }
tiny_http = "0.12"
tokio = { version = "1" }
tokio = "1"
tokio-rustls = { version = "0.26", default-features = false }
toml = "0.9"
toml_edit = { version = "0.22", default-features = false, features = [
"display",
"parse",
"serde",
] }
toml = { version = "0.9", default-features = false, features = ["std", "serde", "parse"] }
toml_edit = { version = "0.22", default-features = false, features = ["parse"] }
tower-http = "0.4.4"
tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "43623ec9bf0eaaf7113285c46e8a09018f181b18" }
tracing = "0.1.40"
tracing-subscriber = "0.3"
tree-sitter-bash = "0.25.1"
tree-sitter-c = "0.24.1"
tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609" }
@@ -917,10 +924,13 @@ unindent = "0.2.0"
url = "2.2"
urlencoding = "2.1.2"
usvg = { version = "0.46.0", default-features = false }
uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
uuid = { version = "1.1", features = ["serde"] }
vte = { version = "0.15.0", features = ["ansi"] }
walkdir = "2.5"
wasm-encoder = "0.254"
# Forked because upstream is unmaintained and its worker bootstrap still calls
# the wasm-bindgen init function with the positional arguments deprecated in 0.2.93.
wasm_thread = { git = "https://github.com/zed-industries/wasm_thread", rev = "0cf96c7708dfb97ccf3da50347e25edcf75d6937", version = "0.3", features = ["es_modules"] }
wasmparser = "0.254"
wasmtime = { version = "48", default-features = false, features = [
"anyhow",
@@ -935,80 +945,39 @@ wasmtime = { version = "48", default-features = false, features = [
wasm-bindgen = "0.2.120"
wasm-bindgen-futures = "0.4"
wasmtime-wasi = { version = "48", default-features = false, features = ["p2"] }
wax = "0.7"
wax = { version = "0.7", default-features = false }
web-sys = "0.3"
web-time = "1.1.0"
webpki-roots = "1.0.8"
webrtc-sys = "0.3.23"
wgpu = "29.0.4"
wgpu = { version = "29.0", default-features = false }
which = "8"
windows-core = "0.62"
windows-registry = "0.6.0"
yaml-rust2 = "0.8"
yawc = "0.4.2"
xkbcommon = { version = "0.8", default-features = false }
yaml-rust2 = { version = "0.8", default-features = false }
yawc = { version = "0.4", default-features = false }
zeroize = "1.8"
zstd = "0.11"
zstd = { version = "0.13", default-features = false, features = ["legacy", "arrays"] }
[workspace.dependencies.windows]
version = "0.62"
features = [
"Data_Xml_Dom",
"Foundation_Numerics",
"Globalization_DateTimeFormatting",
"Storage_Search",
"Storage_Streams",
"System_Threading",
"UI_Notifications",
"UI_ViewManagement",
"Wdk_System_SystemServices",
"Win32_Foundation",
"Win32_Globalization",
"Win32_Graphics_Direct3D",
"Win32_Graphics_Direct3D11",
"Win32_Graphics_Direct3D_Fxc",
"Win32_Graphics_DirectComposition",
"Win32_Graphics_DirectWrite",
"Win32_Graphics_DirectManipulation",
"Win32_Graphics_Dwm",
"Win32_Graphics_Dxgi",
"Win32_Graphics_Dxgi_Common",
"Win32_Graphics_Gdi",
"Win32_Graphics_Imaging",
"Win32_Graphics_Hlsl",
"Win32_Networking_WinSock",
"Win32_Security",
"Win32_Security_Credentials",
"Win32_Security_Cryptography",
"Win32_Storage_FileSystem",
"Win32_Storage_Packaging_Appx",
"Win32_System_Com",
"Win32_System_Com_StructuredStorage",
"Win32_System_Console",
"Win32_System_Diagnostics_Debug",
"Win32_System_DataExchange",
"Win32_System_IO",
"Win32_System_JobObjects",
"Win32_System_LibraryLoader",
"Win32_System_Memory",
"Win32_System_Ole",
"Win32_System_Performance",
"Win32_System_Pipes",
"Win32_System_Power",
"Win32_System_RestartManager",
"Win32_System_SystemInformation",
"Win32_System_SystemServices",
"Win32_System_Threading",
"Win32_System_Variant",
"Win32_System_WinRT",
"Win32_UI_Controls",
"Win32_UI_HiDpi",
"Win32_UI_Input_Ime",
"Win32_UI_Input_KeyboardAndMouse",
"Win32_UI_Input_Pointer",
"Win32_UI_Shell",
"Win32_UI_Shell_Common",
"Win32_UI_Shell_PropertiesSystem",
"Win32_UI_WindowsAndMessaging",
"Win32_Media",
]
[patch.crates-io]
+2 -2
View File
@@ -47,7 +47,6 @@ indoc.workspace = true
itertools.workspace = true
language.workspace = true
language_model.workspace = true
language_models.workspace = true
log.workspace = true
parking_lot.workspace = true
paths.workspace = true
@@ -103,6 +102,7 @@ gpui = { workspace = true, "features" = ["test-support"] }
gpui_tokio.workspace = true
language = { workspace = true, "features" = ["test-support"] }
language_model = { workspace = true, "features" = ["test-support"] }
language_models.workspace = true
lsp = { workspace = true, "features" = ["test-support"] }
pretty_assertions.workspace = true
project = { workspace = true, "features" = ["test-support"] }
@@ -113,7 +113,7 @@ settings = { workspace = true, "features" = ["test-support"] }
theme = { workspace = true, "features" = ["test-support"] }
theme_settings.workspace = true
unindent = { workspace = true }
unindent.workspace = true
zlog.workspace = true
+5 -3
View File
@@ -14,6 +14,8 @@ test-support = [
"client/test-support",
"dep:gpui_tokio",
"reqwest_client/test-support",
"dep:indoc",
"dep:tempfile",
]
e2e = []
@@ -40,9 +42,8 @@ futures.workspace = true
gpui.workspace = true
feature_flags.workspace = true
gpui_tokio = { workspace = true, optional = true }
google_ai.workspace = true
http_client.workspace = true
indoc.workspace = true
indoc = { workspace = true, optional = true }
language_model.workspace = true
log.workspace = true
project.workspace = true
@@ -53,7 +54,7 @@ serde.workspace = true
serde_json.workspace = true
settings.workspace = true
task.workspace = true
tempfile.workspace = true
tempfile = { workspace = true, optional = true }
thiserror.workspace = true
ui.workspace = true
terminal.workspace = true
@@ -74,3 +75,4 @@ gpui_tokio.workspace = true
project = { workspace = true, features = ["test-support"] }
reqwest_client = { workspace = true, features = ["test-support"] }
settings = { workspace = true, features = ["test-support"] }
tempfile.workspace = true
+2 -2
View File
@@ -6,7 +6,7 @@ use anyhow::{Context as _, Result};
use collections::HashSet;
use fs::Fs;
use gpui::{App, AppContext as _, Entity, Task};
use language_model::{ApiKey, EnvVar};
use language_model::{ApiKey, EnvVar, GOOGLE_AI_API_URL};
use project::{
Project,
agent_server_store::{AgentId, AllAgentServersSettings},
@@ -292,7 +292,7 @@ fn api_key_for_gemini_cli(cx: &mut App) -> Task<Result<String>> {
return Task::ready(Ok(key));
}
let credentials_provider = zed_credentials_provider::global(cx);
let api_url = google_ai::API_URL.to_string();
let api_url = GOOGLE_AI_API_URL.to_string();
cx.spawn(async move |cx| {
Ok(
ApiKey::load_from_system_keychain(&api_url, credentials_provider.as_ref(), cx)
+1 -1
View File
@@ -18,7 +18,7 @@ doctest = false
[dependencies]
anyhow.workspace = true
chrono.workspace = true
chrono = { workspace = true, default-features = true }
collections.workspace = true
futures.workspace = true
http_client.workspace = true
+1 -1
View File
@@ -27,7 +27,7 @@ zeroize.workspace = true
which.workspace = true
[target.'cfg(target_os = "windows")'.dependencies]
windows.workspace = true
windows = { workspace = true, features = ["Win32_Security_Cryptography"] }
[dev-dependencies]
gpui = { workspace = true, features = ["test-support"] }
+4 -6
View File
@@ -13,20 +13,18 @@ name = "auto_update_helper"
path = "src/auto_update_helper.rs"
doctest = false
[dependencies]
[target.'cfg(target_os = "windows")'.dependencies]
anyhow.workspace = true
log.workspace = true
simplelog.workspace = true
[target.'cfg(target_os = "windows")'.dependencies]
scopeguard = "1.2"
windows.workspace = true
windows = { workspace = true, features = ["Win32_System_RestartManager", "Win32_UI_Controls"] }
[target.'cfg(target_os = "windows")'.dev-dependencies]
tempfile.workspace = true
[build-dependencies]
windows_resources = { path = "../windows_resources" }
[target.'cfg(target_os = "windows")'.build-dependencies]
windows_resources.workspace = true
[package.metadata.docs.rs]
targets = ["x86_64-pc-windows-msvc"]
+2
View File
@@ -1,4 +1,6 @@
fn main() {
#[cfg(not(target_os = "windows"))]
println!("cargo:rerun-if-changed=build.rs");
#[cfg(target_os = "windows")]
{
println!("cargo:rerun-if-env-changed=RELEASE_CHANNEL");
+3 -3
View File
@@ -18,11 +18,11 @@ schemars = ["dep:schemars"]
[dependencies]
anyhow.workspace = true
aws-sdk-bedrockruntime = { workspace = true, features = ["behavior-version-latest"] }
aws-smithy-types = {workspace = true}
aws-sdk-bedrockruntime.workspace = true
aws-smithy-types.workspace = true
futures.workspace = true
http_client.workspace = true
schemars = { workspace = true, optional = true }
schemars = { workspace = true, features = ["derive"], optional = true }
serde.workspace = true
serde_json.workspace = true
strum.workspace = true
+2
View File
@@ -18,6 +18,8 @@ test-support = []
[dependencies]
anyhow.workspace = true
criterion.workspace = true
[target.'cfg(unix)'.dependencies]
libc.workspace = true
[target.'cfg(target_os = "linux")'.dependencies]
-4
View File
@@ -17,7 +17,3 @@ test = false
gpui.workspace = true
ui.workspace = true
workspace.workspace = true
[dev-dependencies]
gpui = { workspace = true, features = ["test-support"] }
workspace = { workspace = true, features = ["test-support"] }
+3 -2
View File
@@ -13,7 +13,7 @@ path = "src/buffer_diff.rs"
doctest = false
[features]
test-support = ["settings"]
test-support = ["settings", "dep:pretty_assertions"]
[dependencies]
clock.workspace = true
@@ -21,7 +21,7 @@ imara-diff.workspace = true
gpui.workspace = true
language.workspace = true
log.workspace = true
pretty_assertions.workspace = true
pretty_assertions = { workspace = true, optional = true }
rope.workspace = true
settings = { workspace = true, optional = true }
sum_tree.workspace = true
@@ -33,6 +33,7 @@ ztracing.workspace = true
[dev-dependencies]
ctor.workspace = true
gpui = { workspace = true, features = ["test-support"] }
pretty_assertions.workspace = true
rand.workspace = true
settings.workspace = true
+47 -24
View File
@@ -15,45 +15,68 @@ doctest = false
[[bin]]
name = "cli"
path = "src/main.rs"
required-features = ["cli"]
[features]
no-bundled-uninstall = []
default = []
no-bundled-uninstall = ["cli"]
default = ["cli"]
cli = [
"dep:askpass",
"dep:clap",
"dep:clap_complete",
"dep:clap_complete_nushell",
"dep:console",
"dep:core-foundation",
"dep:core-services",
"dep:dialoguer",
"dep:exec",
"dep:fork",
"dep:parking_lot",
"dep:paths",
"dep:plist",
"dep:rayon",
"dep:release_channel",
"dep:tempfile",
"dep:util",
"dep:walkdir",
"dep:windows",
"dep:windows_resources",
]
[dependencies]
anyhow.workspace = true
askpass.workspace = true
clap.workspace = true
clap_complete.workspace = true
clap_complete_nushell.workspace = true
askpass = { workspace = true, optional = true }
clap = { workspace = true, optional = true }
clap_complete = { workspace = true, optional = true }
clap_complete_nushell = { workspace = true, optional = true }
collections.workspace = true
console.workspace = true
dialoguer.workspace = true
console = { workspace = true, optional = true }
dialoguer = { workspace = true, optional = true }
ipc-channel = "0.19"
parking_lot.workspace = true
paths.workspace = true
release_channel.workspace = true
serde.workspace = true
util.workspace = true
tempfile.workspace = true
rayon.workspace = true
walkdir = "2.5"
parking_lot = { workspace = true, optional = true }
paths = { workspace = true, optional = true }
release_channel = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive"] }
util = { workspace = true, optional = true }
tempfile = { workspace = true, optional = true }
rayon = { workspace = true, optional = true }
walkdir = { workspace = true, optional = true }
[dev-dependencies]
serde_json.workspace = true
util = { workspace = true, features = ["test-support"] }
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
exec.workspace = true
fork.workspace = true
exec = { workspace = true, optional = true }
fork = { workspace = true, optional = true }
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation.workspace = true
core-services = "1"
plist = "1.3"
core-foundation = { workspace = true, optional = true }
core-services = { workspace = true, optional = true }
plist = { workspace = true, optional = true }
[target.'cfg(target_os = "windows")'.dependencies]
windows.workspace = true
windows = { workspace = true, optional = true }
[build-dependencies]
windows_resources = { path = "../windows_resources" }
[target.'cfg(target_os = "windows")'.build-dependencies]
windows_resources = { workspace = true, optional = true }
+1 -1
View File
@@ -27,7 +27,7 @@ fn main() {
println!("cargo:rustc-env=ZED_BUILD_ID={build_identifier}");
}
#[cfg(windows)]
#[cfg(all(windows, feature = "cli"))]
{
println!("cargo:rerun-if-env-changed=RELEASE_CHANNEL");
println!("cargo:rerun-if-env-changed=GITHUB_RUN_NUMBER");
+2 -2
View File
@@ -19,7 +19,7 @@ test-support = ["clock/test-support", "collections/test-support", "gpui/test-sup
anyhow.workspace = true
async-channel.workspace = true
async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots"] }
chrono = { workspace = true, features = ["serde"] }
chrono.workspace = true
clock.workspace = true
cloud_api_client.workspace = true
cloud_api_types.workspace = true
@@ -73,7 +73,7 @@ util = { workspace = true, features = ["test-support"] }
[target.'cfg(target_os = "windows")'.dependencies]
semver.workspace = true
windows.workspace = true
windows = { workspace = true, features = ["Wdk_System_SystemServices", "Win32_System_SystemInformation"] }
[target.'cfg(target_os = "macos")'.dependencies]
objc2-foundation.workspace = true
+1 -1
View File
@@ -17,5 +17,5 @@ test-support = ["dep:parking_lot"]
[dependencies]
parking_lot = { workspace = true, optional = true }
serde.workspace = true
serde = { workspace = true, features = ["derive"] }
smallvec.workspace = true
+4 -5
View File
@@ -15,7 +15,6 @@ doctest = false
[dependencies]
anyhow.workspace = true
cloud_api_types.workspace = true
futures-lite.workspace = true
futures.workspace = true
gpui.workspace = true
http_client.workspace = true
@@ -26,13 +25,13 @@ thiserror.workspace = true
yawc.workspace = true
[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
# Workspace inheritance would re-enable defaults, including blocking synchronization.
async-lock = { version = "3.4.2", default-features = false }
[target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
async-lock.workspace = true
[target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
async-lock = { workspace = true, features = ["std"] }
[target.'cfg(not(target_family = "wasm"))'.dependencies]
futures-lite.workspace = true
gpui_tokio.workspace = true
http_client_tls.workspace = true
tokio-rustls.workspace = true
+3 -3
View File
@@ -18,10 +18,10 @@ doctest = false
[dependencies]
anyhow.workspace = true
serde = { workspace = true, features = ["derive", "rc"] }
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
strum = { workspace = true, features = ["derive"] }
uuid = { workspace = true, features = ["serde"] }
strum.workspace = true
uuid.workspace = true
zeta_prompt = { workspace = true, optional = true }
+8 -8
View File
@@ -30,9 +30,9 @@ path = "tests/integration/collab_tests.rs"
anyhow.workspace = true
async-trait.workspace = true
async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots" ] }
aws-config = { version = "1.1.5" }
aws-sdk-kinesis = { version = "1.51.0", default-features = false, features = ["default-https-client", "rt-tokio"] }
aws-sdk-s3 = { version = "1.15.0", default-features = false, features = ["sigv4a", "http-1x", "default-https-client", "rt-tokio"] }
aws-config = "1.1.5"
aws-sdk-kinesis = { workspace = true, features = ["default-https-client", "rt-tokio"] }
aws-sdk-s3 = { workspace = true, features = ["sigv4a", "http-1x", "default-https-client", "rt-tokio"] }
axum = { version = "0.6", features = ["json", "headers", "ws"] }
chrono.workspace = true
clock.workspace = true
@@ -52,13 +52,13 @@ prost.workspace = true
reqwest = { version = "0.11", features = ["json"] }
rpc.workspace = true
# sea-orm and sea-orm-macros versions must match exactly.
sea-orm = { version = "=1.1.10", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
sea-orm = { workspace = true, features = ["sqlx-postgres", "runtime-tokio-rustls", "with-uuid", "macros", "with-json", "with-chrono", "with-time"] }
sea-orm-macros = "=1.1.10"
semver.workspace = true
serde.workspace = true
serde_json.workspace = true
sha2.workspace = true
sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
sqlx = { workspace = true, features = ["any", "migrate"] }
strum.workspace = true
telemetry_events.workspace = true
text.workspace = true
@@ -68,7 +68,7 @@ toml.workspace = true
tower = "0.4"
tower-http = { workspace = true, features = ["trace"] }
tracing.workspace = true
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
tracing-subscriber = { workspace = true, features = ["env-filter", "json"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
util.workspace = true
uuid.workspace = true
@@ -118,11 +118,11 @@ release_channel.workspace = true
remote = { workspace = true, features = ["test-support"] }
remote_server.workspace = true
rpc = { workspace = true, features = ["test-support"] }
sea-orm = { version = "=1.1.10", features = ["sqlx-sqlite"] }
sea-orm.workspace = true
serde_json.workspace = true
session = { workspace = true, features = ["test-support"] }
settings = { workspace = true, features = ["test-support"] }
sqlx = { version = "0.8", features = ["sqlite"] }
sqlx.workspace = true
task.workspace = true
theme.workspace = true
theme_settings = { workspace = true, features = ["test-support"] }
-16
View File
@@ -59,19 +59,3 @@ ui.workspace = true
util.workspace = true
workspace.workspace = true
zed_actions.workspace = true
[dev-dependencies]
call = { workspace = true, features = ["test-support"] }
client = { workspace = true, features = ["test-support"] }
collections = { workspace = true, features = ["test-support"] }
editor = { workspace = true, features = ["test-support"] }
gpui = { workspace = true, features = ["test-support"] }
notifications = { workspace = true, features = ["test-support"] }
project = { workspace = true, features = ["test-support"] }
rpc = { workspace = true, features = ["test-support"] }
settings = { workspace = true, features = ["test-support"] }
util = { workspace = true, features = ["test-support"] }
workspace = { workspace = true, features = ["test-support"] }
+3 -1
View File
@@ -6,7 +6,6 @@ edition.workspace = true
license = "GPL-3.0-or-later"
[dependencies]
async-process.workspace = true
crash-handler.workspace = true
log.workspace = true
minidumper.workspace = true
@@ -16,6 +15,9 @@ serde_json.workspace = true
system_specs.workspace = true
zstd.workspace = true
[target.'cfg(not(target_os = "windows"))'.dependencies]
async-process.workspace = true
[target.'cfg(target_os = "linux")'.dependencies]
libc.workspace = true
+1 -1
View File
@@ -26,7 +26,7 @@ release_channel.workspace = true
sqlez.workspace = true
sqlez_macros.workspace = true
util.workspace = true
uuid.workspace = true
uuid = { workspace = true, features = ["v5", "v7"] }
zed_env_vars.workspace = true
[dev-dependencies]
+4 -2
View File
@@ -23,13 +23,14 @@ test-support = [
"util/test-support",
"workspace/test-support",
"unindent",
"dep:command_palette_hooks",
]
[dependencies]
anyhow.workspace = true
bitflags.workspace = true
collections.workspace = true
command_palette_hooks.workspace = true
command_palette_hooks = { workspace = true, optional = true }
dap.workspace = true
dap_adapters = { workspace = true, optional = true }
db.workspace = true
@@ -51,7 +52,6 @@ parking_lot.workspace = true
parse_int.workspace = true
paths.workspace = true
picker.workspace = true
pretty_assertions.workspace = true
project.workspace = true
rpc.workspace = true
schemars.workspace = true
@@ -75,12 +75,14 @@ workspace.workspace = true
zed_actions.workspace = true
[dev-dependencies]
command_palette_hooks.workspace = true
dap = { workspace = true, features = ["test-support"] }
dap_adapters = { workspace = true, features = ["test-support"] }
debugger_tools = { workspace = true, features = ["test-support"] }
editor = { workspace = true, features = ["test-support"] }
gpui = { workspace = true, features = ["test-support"] }
language = { workspace = true, features = ["test-support"] }
pretty_assertions.workspace = true
project = { workspace = true, features = ["test-support"] }
tree-sitter-go.workspace = true
unindent.workspace = true
+1 -1
View File
@@ -21,6 +21,6 @@ schemars = ["dep:schemars"]
anyhow.workspace = true
futures.workspace = true
http_client.workspace = true
schemars = { workspace = true, optional = true }
schemars = { workspace = true, features = ["derive"], optional = true }
serde.workspace = true
serde_json.workspace = true
+1 -1
View File
@@ -11,7 +11,7 @@ collections.workspace = true
jsonschema.workspace = true
# We are specifically pinning this version of mdbook, as later versions introduce issues with double-nested subdirectories.
# Ask @maxdeviant about this before bumping.
mdbook = "= 0.4.40"
mdbook.workspace = true
regex.workspace = true
schemars.workspace = true
serde.workspace = true
+3 -3
View File
@@ -32,7 +32,7 @@ credentials_provider.workspace = true
db.workspace = true
edit_prediction_types.workspace = true
edit_prediction_context.workspace = true
edit_prediction_metrics = { workspace = true, features = ["tree-sitter"] }
edit_prediction_metrics.workspace = true
feature_flags.workspace = true
fs.workspace = true
futures.workspace = true
@@ -48,7 +48,6 @@ menu.workspace = true
ollama.workspace = true
open_ai.workspace = true
postage.workspace = true
pretty_assertions.workspace = true
project.workspace = true
pulldown-cmark.workspace = true
rand.workspace = true
@@ -63,7 +62,7 @@ telemetry.workspace = true
telemetry_events.workspace = true
text.workspace = true
thiserror.workspace = true
toml.workspace = true
toml = { workspace = true, features = ["display"] }
ui.workspace = true
util.workspace = true
uuid.workspace = true
@@ -88,6 +87,7 @@ language = { workspace = true, features = ["test-support"] }
language_model = { workspace = true, features = ["test-support"] }
lsp.workspace = true
parking_lot.workspace = true
pretty_assertions.workspace = true
project = { workspace = true, features = ["test-support"] }
settings = { workspace = true, features = ["test-support"] }
workspace = { workspace = true, features = ["test-support"] }
+2 -2
View File
@@ -62,12 +62,12 @@ util.workspace = true
watch.workspace = true
edit_prediction = { workspace = true, features = ["cli-support"] }
edit_prediction_context.workspace = true
edit_prediction_metrics = { workspace = true, features = ["tree-sitter"] }
edit_prediction_metrics.workspace = true
telemetry_events.workspace = true
wasmtime.workspace = true
zeta_prompt.workspace = true
rand.workspace = true
similar = "2.7.0"
similar.workspace = true
flate2 = "1.1.8"
toml.workspace = true
gaoya = "0.2.0"
+1
View File
@@ -1,4 +1,5 @@
fn main() {
println!("cargo:rerun-if-changed=../zed/Cargo.toml");
let cargo_toml =
std::fs::read_to_string("../zed/Cargo.toml").expect("Failed to read crates/zed/Cargo.toml");
let version = cargo_toml
+1 -1
View File
@@ -19,7 +19,7 @@ tree-sitter = ["dep:tree-sitter"]
imara-diff.workspace = true
serde.workspace = true
serde_json = "1.0"
similar = "2.7.0"
similar.workspace = true
tree-sitter = { workspace = true, optional = true }
zeta_prompt.workspace = true
+9 -4
View File
@@ -28,12 +28,15 @@ test-support = [
"tree-sitter-html",
"proptest",
"unindent",
"dep:pretty_assertions",
"dep:assets",
"dep:indoc",
]
[dependencies]
aho-corasick.workspace = true
anyhow.workspace = true
assets.workspace = true
assets = { workspace = true, optional = true }
base64.workspace = true
breadcrumbs.workspace = true
client.workspace = true
@@ -52,7 +55,7 @@ fuzzy.workspace = true
fs.workspace = true
git.workspace = true
gpui.workspace = true
indoc.workspace = true
indoc = { workspace = true, optional = true }
edit_prediction_types.workspace = true
itertools.workspace = true
language.workspace = true
@@ -65,7 +68,7 @@ menu.workspace = true
multi_buffer.workspace = true
ordered-float.workspace = true
parking_lot.workspace = true
pretty_assertions.workspace = true
pretty_assertions = { workspace = true, optional = true }
project.workspace = true
proptest = { workspace = true, optional = true }
proptest-derive = { workspace = true, optional = true }
@@ -103,16 +106,18 @@ uuid.workspace = true
vim_mode_setting.workspace = true
workspace.workspace = true
zed_actions.workspace = true
zlog.workspace = true
[dev-dependencies]
assets.workspace = true
ctor.workspace = true
gpui = { workspace = true, features = ["test-support"] }
indoc.workspace = true
language = { workspace = true, features = ["test-support"] }
languages = {workspace = true, features = ["test-support"] }
lsp = { workspace = true, features = ["test-support"] }
markdown = { workspace = true, features = ["test-support"] }
multi_buffer = { workspace = true, features = ["test-support"] }
pretty_assertions.workspace = true
project = { workspace = true, features = ["test-support"] }
proptest.workspace = true
proptest-derive.workspace = true
+1 -2
View File
@@ -10,7 +10,7 @@ path = "etw_tracing.rs"
test = false
doctest = false
[dependencies]
[target.'cfg(target_os = "windows")'.dependencies]
anyhow.workspace = true
gpui.workspace = true
net.workspace = true
@@ -19,7 +19,6 @@ serde_json.workspace = true
util.workspace = true
workspace.workspace = true
[target.'cfg(target_os = "windows")'.dependencies]
wprcontrol = { git = "https://github.com/zed-industries/wprcontrol", rev = "cd811f7" }
windows-core = "0.61"
windows = { version = "0.61", features = [
+1 -1
View File
@@ -21,6 +21,6 @@ preview = []
nightly = []
[target.'cfg(target_os = "windows")'.dependencies]
windows.workspace = true
windows = { workspace = true, features = ["Win32_Globalization", "Win32_System_SystemServices"] }
windows-core.workspace = true
windows-registry.workspace = true
+1
View File
@@ -1,4 +1,5 @@
fn main() {
println!("cargo:rerun-if-changed=build.rs");
let version = std::env::var("CARGO_PKG_VERSION").unwrap();
let out_dir = std::env::var("OUT_DIR").unwrap();
+3 -3
View File
@@ -14,7 +14,7 @@ path = "src/main.rs"
[dependencies]
anyhow.workspace = true
clap = { workspace = true, features = ["derive"] }
clap.workspace = true
cloud_api_types.workspace = true
env_logger.workspace = true
extension.workspace = true
@@ -32,7 +32,7 @@ snippet_provider.workspace = true
task.workspace = true
theme_settings.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = ["full"] }
toml.workspace = true
tokio = { workspace = true, features = ["fs", "macros", "parking_lot", "process", "sync", "time"] }
toml = { workspace = true, features = ["display"] }
tree-sitter = { workspace = true, features = ["wasm"] }
wasmtime.workspace = true
+1 -1
View File
@@ -47,7 +47,7 @@ settings.workspace = true
task.workspace = true
telemetry.workspace = true
tempfile.workspace = true
toml.workspace = true
toml = { workspace = true, features = ["display"] }
tracing.workspace = true
url.workspace = true
util.workspace = true
-1
View File
@@ -30,7 +30,6 @@ gpui.workspace = true
language.workspace = true
log.workspace = true
markdown.workspace = true
num-format.workspace = true
picker.workspace = true
project.workspace = true
release_channel.workspace = true
@@ -4,9 +4,8 @@ use cloud_api_types::{ExtensionApiManifest, ExtensionMetadata, ExtensionProvides
use extension::{ExtensionManifest, SchemaVersion};
use extension_host::{ExtensionOperation, ExtensionStatus, ExtensionStore};
use gpui::{Anchor, ElementId, Entity, Point, SharedString, prelude::*};
use num_format::{Locale, ToFormattedString};
use release_channel::ReleaseChannel;
use ui::{Chip, ContextMenu, PopoverMenu, Tooltip, prelude::*};
use ui::{Chip, ContextMenu, PopoverMenu, Tooltip, prelude::*, utils::format_number_with_commas};
type ContextMenuBuilder = Box<
dyn Fn(Arc<str>, SharedString, &mut Window, &mut App) -> Option<Entity<ContextMenu>> + 'static,
@@ -683,7 +682,7 @@ impl RenderOnce for ExtensionCard {
.children(download_count.map(|download_count| {
Label::new(format!(
"Downloads: {}",
download_count.to_formatted_string(&Locale::en)
format_number_with_commas(u128::from(download_count))
))
.size(LabelSize::Small)
})),
+1 -1
View File
@@ -16,4 +16,4 @@ workspace = true
[dependencies]
proc-macro2.workspace = true
quote.workspace = true
syn.workspace = true
syn = { workspace = true, features = ["derive", "parsing", "printing"] }
+1 -1
View File
@@ -43,7 +43,6 @@ tempfile.workspace = true
text.workspace = true
util.workspace = true
path.workspace = true
is_executable = "1.0.5"
notify = "9.0.0-rc.4"
trash = { git = "https://github.com/zed-industries/trash-rs", rev = "41c6c800d884a89351f3b8856d12894cccee261d" }
@@ -51,6 +50,7 @@ trash = { git = "https://github.com/zed-industries/trash-rs", rev = "41c6c800d88
rustix.workspace = true
[target.'cfg(target_os = "windows")'.dependencies]
is_executable.workspace = true
windows.workspace = true
dunce.workspace = true
async-std.workspace = true
+4
View File
@@ -15,10 +15,14 @@ doctest = false
[dependencies]
fuzzy.workspace = true
nucleo.workspace = true
parking_lot = { workspace = true, features = ["arc_lock", "send_guard"] }
gpui.workspace = true
gpui_util.workspace = true
path.workspace = true
[package.metadata.cargo-shear]
ignored = ["parking_lot"]
[dev-dependencies]
criterion.workspace = true
gpui = { workspace = true, features = ["test-support"] }
+1 -3
View File
@@ -6,15 +6,13 @@ use http_client::{
AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest, RequestBuilderExt,
StatusCode, http::HeaderMap,
};
pub use language_model_core::ModelMode as GoogleModelMode;
pub use language_model_core::{GOOGLE_AI_API_URL as API_URL, ModelMode as GoogleModelMode};
use language_model_core::{
GOOGLE_PROVIDER_NAME, LanguageModelCompletionError, ProviderErrorCategory,
};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
pub mod completion;
pub const API_URL: &str = "https://generativelanguage.googleapis.com";
pub async fn stream_generate_content(
client: &dyn HttpClient,
api_url: &str,
+43 -34
View File
@@ -24,6 +24,9 @@ test-support = [
"wayland",
"x11",
"proptest",
"dep:futures-concurrency",
"dep:postage",
"dep:web-time",
]
bench-support = ["profiler", "dep:criterion", "dep:bench_metrics"]
# Preserve the published feature name while consumers migrate to `bench-support`.
@@ -32,12 +35,15 @@ inspector = ["gpui_macros/inspector"]
# Tracks every entity handle so tests can assert nothing leaked. Also enabled
# by setting `GPUI_LEAK_DETECTION` when building; see `build.rs`.
leak-detection = []
font-kit = []
wayland = []
x11 = [
"scap?/x11",
]
screen-capture = [
"scap",
"dep:objc2-core-foundation",
"dep:objc2-core-video",
]
windows-manifest = ["dep:embed-resource"]
profiler = ["dep:hdrhistogram"]
@@ -57,10 +63,10 @@ collections.workspace = true
bench_metrics = { workspace = true, optional = true }
criterion = { workspace = true, optional = true }
ctor.workspace = true
derive_more.workspace = true
derive_more = { workspace = true, features = ["add", "add_assign", "mul", "mul_assign", "not"] }
etagere.workspace = true
futures.workspace = true
futures-concurrency.workspace = true
futures-concurrency = { workspace = true, optional = true }
gpui_macros.workspace = true
gpui_shared_string.workspace = true
http_client.workspace = true
@@ -71,48 +77,56 @@ log.workspace = true
num_cpus = "1.13"
parking = "2.0.0"
parking_lot.workspace = true
postage.workspace = true
postage = { workspace = true, features = ["blocking"], optional = true }
proptest = { workspace = true, optional = true }
chrono.workspace = true
chrono = { workspace = true, default-features = true }
profiling.workspace = true
rand.workspace = true
rand = { workspace = true, features = ["small_rng", "thread_rng"] }
raw-window-handle.workspace = true
regex.workspace = true
regex = { workspace = true, default-features = true }
refineable.workspace = true
scheduler.workspace = true
resvg.workspace = true
usvg.workspace = true
ttf-parser = "0.25"
util_macros.workspace = true
schemars.workspace = true
schemars = { workspace = true, features = ["derive"] }
seahash = "4.1"
serde.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
slotmap.workspace = true
smallvec.workspace = true
stacksafe = { workspace = true, optional = true }
strum.workspace = true
sum_tree.workspace = true
taffy = "=0.13.0"
taffy = { workspace = true, features = [
"std",
"taffy_tree",
"flexbox",
"grid",
"block_layout",
"float_layout",
"content_size",
] }
thiserror.workspace = true
gpui_util.workspace = true
hdrhistogram = { workspace = true, optional = true }
waker-fn = "1.2.0"
lyon = "1.0"
pin-project = "1.1.10"
spin = "0.10.0"
pollster.workspace = true
spin.workspace = true
url.workspace = true
uuid.workspace = true
web-time.workspace = true
uuid = { workspace = true, features = ["v4"] }
web-time = { workspace = true, optional = true }
heapless.workspace = true
[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
# Workspace inheritance would re-enable defaults, including blocking channel synchronization.
async-channel = { version = "2.5.0", default-features = false }
async-channel.workspace = true
[target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
async-channel.workspace = true
async-channel = { workspace = true, features = ["std"] }
[target.'cfg(not(target_family = "wasm"))'.dependencies]
pollster.workspace = true
[target.'cfg(target_family = "wasm")'.dependencies]
getrandom = { version = "0.3.4", features = ["wasm_js"] }
@@ -123,10 +137,8 @@ uuid = { workspace = true, features = ["js"] }
core-video.workspace = true
[target.'cfg(target_os = "macos")'.dependencies]
objc2-core-foundation.workspace = true
objc2-core-video.workspace = true
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
objc2-core-foundation = { workspace = true, optional = true }
objc2-core-video = { workspace = true, optional = true }
log.workspace = true
objc2 = { workspace = true, optional = true }
objc2-metal = { version = "0.3", optional = true }
@@ -140,10 +152,8 @@ libc.workspace = true
[target.'cfg(target_os = "windows")'.dependencies]
windows = { workspace = true, features = [
"Win32_Foundation",
"Win32_System_Power",
"Win32_System_RemoteDesktop",
"Win32_System_Threading",
"Win32_System_WindowsProgramming",
] }
@@ -153,32 +163,31 @@ backtrace.workspace = true
bench_metrics = { workspace = true, features = ["test-support"] }
collections = { workspace = true, features = ["test-support"] }
env_logger.workspace = true
futures-concurrency.workspace = true
postage = { workspace = true, features = ["blocking"] }
web-time.workspace = true
gpui_platform = { workspace = true, features = ["font-kit", "wayland", "x11"] }
gpui_util = { workspace = true }
gpui_util.workspace = true
lyon = { version = "1.0", features = ["extra"] }
rand.workspace = true
rand = { workspace = true, default-features = true }
scheduler = { workspace = true, features = ["test-support"] }
unicode-segmentation = { workspace = true }
unicode-segmentation.workspace = true
util_macros.workspace = true
[target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
http_client = { workspace = true, features = ["test-support"] }
proptest = { workspace = true }
proptest.workspace = true
reqwest_client = { workspace = true, features = ["test-support"] }
[target.'cfg(target_family = "wasm")'.dev-dependencies]
wasm-bindgen = { workspace = true }
web-sys = { version = "0.3", features = ["console"] }
wasm-bindgen.workspace = true
web-sys.workspace = true
[build-dependencies]
embed-resource = { version = "3.0", optional = true }
[target.'cfg(target_os = "macos")'.build-dependencies]
bindgen = "0.72"
[package.metadata.cargo-shear]
ignored = [
"bindgen",
"font-kit",
"getrandom",
"objc2",
"objc2-metal",
+1
View File
@@ -1,6 +1,7 @@
#![allow(clippy::disallowed_methods, reason = "build scripts are exempt")]
fn main() {
println!("cargo:rerun-if-changed=build.rs");
println!("cargo::rustc-check-cfg=cfg(gles)");
// Leak detection does bookkeeping on every entity handle, so `test-support`
+1 -1
View File
@@ -27,7 +27,7 @@ async-task.workspace = true
block2.workspace = true
core-foundation.workspace = true
core-graphics.workspace = true
core-video.workspace = true
core-video = { workspace = true, features = ["metal"] }
derive_more.workspace = true
dispatch2.workspace = true
etagere.workspace = true
+7 -4
View File
@@ -16,6 +16,7 @@ doctest = false
default = ["wayland", "x11"]
test-support = ["gpui/test-support"]
wayland = [
"dep:accesskit_unix",
"gpui_wgpu",
"ashpd/wayland",
@@ -30,8 +31,10 @@ wayland = [
"xkbcommon/wayland",
"open",
"gpui/wayland",
"uuid/v5",
]
x11 = [
"dep:accesskit_unix",
"gpui_wgpu",
"ashpd",
@@ -51,9 +54,9 @@ screen-capture = [
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
accesskit.workspace = true
accesskit_unix.workspace = true
accesskit_unix = { workspace = true, optional = true }
anyhow.workspace = true
bytemuck = "1"
bytemuck.workspace = true
collections.workspace = true
futures.workspace = true
gpui.workspace = true
@@ -70,7 +73,7 @@ url.workspace = true
uuid.workspace = true
# Always used
oo7 = { version = "0.6", default-features = false, features = [
oo7 = { workspace = true, features = [
"async-std",
"native_crypto",
] }
@@ -82,7 +85,7 @@ raw-window-handle.workspace = true
ashpd = { workspace = true, optional = true }
filedescriptor = { version = "0.8.2", optional = true }
open = { version = "5.2.0", optional = true }
xkbcommon = { version = "0.8.0", default-features = false, optional = true }
xkbcommon = { workspace = true, optional = true }
# Screen capture
scap = { workspace = true, optional = true }
+9 -9
View File
@@ -17,8 +17,8 @@ default = ["gpui/default"]
bench-support = ["gpui/bench-support", "gpui_apple/bench-support"]
test-support = ["gpui/test-support", "gpui_apple/test-support"]
runtime_shaders = ["gpui_apple/runtime_shaders"]
font-kit = ["dep:font-kit"]
screen-capture = ["gpui/screen-capture"]
font-kit = ["dep:font-kit", "dep:core-text", "dep:pathfinder_geometry"]
screen-capture = ["gpui/screen-capture", "dep:objc2-core-graphics", "dep:objc2-core-media", "dep:objc2-screen-capture-kit"]
[dependencies]
gpui.workspace = true
@@ -33,12 +33,12 @@ collections.workspace = true
core-foundation.workspace = true
core-foundation-sys.workspace = true
core-graphics.workspace = true
core-text.workspace = true
core-text = { workspace = true, optional = true }
core-video.workspace = true
ctor.workspace = true
dispatch2.workspace = true
dispatch2 = { workspace = true, features = ["block2", "objc2"] }
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
font-kit = { workspace = true, optional = true, features = ["source"] }
foreign-types.workspace = true
futures.workspace = true
gpui_apple.workspace = true
@@ -49,13 +49,13 @@ log.workspace = true
objc.workspace = true
objc2.workspace = true
objc2-app-kit.workspace = true
objc2-core-graphics.workspace = true
objc2-core-media.workspace = true
objc2-core-graphics = { workspace = true, optional = true }
objc2-core-media = { workspace = true, optional = true }
objc2-foundation.workspace = true
objc2-screen-capture-kit.workspace = true
objc2-screen-capture-kit = { workspace = true, optional = true }
objc2-user-notifications.workspace = true
parking_lot.workspace = true
pathfinder_geometry.workspace = true
pathfinder_geometry = { workspace = true, optional = true }
raw-window-handle.workspace = true
scheduler.workspace = true
semver.workspace = true
+1 -1
View File
@@ -22,7 +22,7 @@ test = false
heck.workspace = true
proc-macro2.workspace = true
quote.workspace = true
syn.workspace = true
syn = { workspace = true, default-features = true, features = ["full", "extra-traits", "visit-mut"] }
[dev-dependencies]
gpui = { workspace = true, features = ["inspector"] }
+1 -1
View File
@@ -17,4 +17,4 @@ test = false
anyhow.workspace = true
gpui.workspace = true
gpui_util.workspace = true
tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
+1 -1
View File
@@ -9,7 +9,7 @@ license = "Apache-2.0"
doctest = false
[dependencies]
log.workspace = true
log = { workspace = true, features = ["serde"] }
anyhow.workspace = true
[target.'cfg(target_os = "windows")'.dependencies]
+6
View File
@@ -154,6 +154,12 @@ pub fn get_windows_system_shell() -> String {
get_powershell().unwrap_or_else(|| (*CMD).clone())
}
#[inline]
pub const fn is_utf8_char_boundary(u8: u8) -> bool {
// This is bit magic equivalent to: b < 128 || b >= 192
(u8 as i8) >= -0x40
}
pub fn post_inc<T: From<u8> + AddAssign<T> + Copy>(value: &mut T) -> T {
let prev = *value;
*value += T::from(1);
+4 -9
View File
@@ -19,8 +19,8 @@ doctest = false
[dependencies]
unicode-properties = "=0.1.3"
unicode-script = "0.5.7"
unicode-segmentation = "1.10"
unicode-script.workspace = true
unicode-segmentation.workspace = true
[target.'cfg(target_family = "wasm")'.dependencies]
gpui.workspace = true
@@ -39,12 +39,8 @@ console_error_panic_hook.workspace = true
js-sys.workspace = true
raw-window-handle.workspace = true
smallvec.workspace = true
# Forked because upstream is unmaintained and its worker bootstrap still calls
# the wasm-bindgen init function with the positional arguments deprecated in 0.2.93.
wasm_thread = { git = "https://github.com/zed-industries/wasm_thread", rev = "0cf96c7708dfb97ccf3da50347e25edcf75d6937", version = "0.3", features = [
"es_modules",
], optional = true }
web-sys = { version = "0.3", features = [
wasm_thread = { workspace = true, optional = true }
web-sys = { workspace = true, features = [
"console",
"Blob",
"Clipboard",
@@ -72,7 +68,6 @@ web-sys = { version = "0.3", features = [
"KeyboardEvent",
"Location",
"MediaQueryList",
"MediaQueryListEvent",
"MouseEvent",
"Navigator",
"OffscreenCanvas",
+9 -4
View File
@@ -21,7 +21,7 @@ test-support = ["gpui/test-support", "dep:image"]
[dependencies]
gpui.workspace = true
anyhow.workspace = true
bytemuck = "1"
bytemuck.workspace = true
collections.workspace = true
cosmic-text = "0.19.0"
etagere.workspace = true
@@ -36,14 +36,19 @@ swash.workspace = true
unicode-bidi.workspace = true
unicode-segmentation.workspace = true
gpui_util.workspace = true
wgpu.workspace = true
# Optional: only needed on platforms with multiple font sources (e.g. Linux)
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
font-kit = { workspace = true, optional = true }
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
wgpu = { workspace = true, features = ["std", "parking_lot", "metal", "gles", "vulkan", "wgsl", "webgpu"] }
[target.'cfg(not(any(target_os = "linux", target_os = "freebsd")))'.dependencies]
wgpu = { workspace = true, default-features = true }
[target.'cfg(target_family = "wasm")'.dependencies]
web-sys = { version = "0.3", features = ["HtmlCanvasElement"] }
web-sys = { workspace = true, features = ["HtmlCanvasElement"] }
wgpu = { workspace = true, features = ["webgl"] }
[dev-dependencies]
+29 -2
View File
@@ -37,8 +37,35 @@ rand.workspace = true
raw-window-handle.workspace = true
scheduler.workspace = true
smallvec.workspace = true
uuid.workspace = true
windows = { workspace = true, features = ["Win32_System_StationsAndDesktops"] }
uuid = { workspace = true, features = ["v5"] }
windows = { workspace = true, features = [
"Data_Xml_Dom",
"UI_Notifications",
"UI_ViewManagement",
"Wdk_System_SystemServices",
"Win32_Graphics_Direct3D11",
"Win32_Graphics_Direct3D_Fxc",
"Win32_Graphics_DirectComposition",
"Win32_Graphics_DirectManipulation",
"Win32_Graphics_DirectWrite",
"Win32_Graphics_Dwm",
"Win32_Graphics_Dxgi_Common",
"Win32_Graphics_Hlsl",
"Win32_Media",
"Win32_Security_Credentials",
"Win32_Storage_Packaging_Appx",
"Win32_System_DataExchange",
"Win32_System_Diagnostics_Debug",
"Win32_System_Memory",
"Win32_System_Performance",
"Win32_System_StationsAndDesktops",
"Win32_System_SystemInformation",
"Win32_System_SystemServices",
"Win32_UI_Controls",
"Win32_UI_HiDpi",
"Win32_UI_Input_Ime",
"Win32_UI_Input_Pointer",
] }
windows-core.workspace = true
windows-numerics = "0.3"
windows-registry.workspace = true
+2
View File
@@ -1,6 +1,8 @@
#![allow(clippy::disallowed_methods, reason = "build scripts are exempt")]
fn main() {
#[cfg(not(all(target_os = "windows", not(debug_assertions))))]
println!("cargo:rerun-if-changed=build.rs");
#[cfg(target_os = "windows")]
{
// Compile HLSL shaders
+1 -1
View File
@@ -20,7 +20,7 @@ doctest = false
anyhow.workspace = true
html5ever.workspace = true
markup5ever_rcdom.workspace = true
regex.workspace = true
regex = { workspace = true, features = ["unicode-perl"] }
[dev-dependencies]
indoc.workspace = true
+5 -4
View File
@@ -10,8 +10,9 @@ description = "A HTTP client library for Zed and GPUI"
workspace = true
[features]
test-support = []
test-support = ["dep:log"]
github-download = [
"dep:async-compression",
"dep:async-fs",
"dep:async-tar",
"dep:sha2",
@@ -25,13 +26,11 @@ doctest = false
[dependencies]
anyhow.workspace = true
async-compression.workspace = true
bytes.workspace = true
derive_more.workspace = true
futures.workspace = true
http-body.workspace = true
http.workspace = true
log.workspace = true
log = { workspace = true, optional = true }
parking_lot.workspace = true
serde.workspace = true
serde_json.workspace = true
@@ -39,6 +38,8 @@ serde_urlencoded.workspace = true
url.workspace = true
[target.'cfg(not(target_family = "wasm"))'.dependencies]
log.workspace = true
async-compression = { workspace = true, optional = true }
util = { workspace = true, optional = true }
async-fs = { workspace = true, optional = true }
async-tar = { workspace = true, optional = true }
+19 -6
View File
@@ -6,7 +6,6 @@ pub mod github_download;
pub use anyhow::{Result, anyhow};
pub use async_body::{AsyncBody, Inner, Json};
use derive_more::Deref;
pub use http::{self, Method, Request, Response, StatusCode, Uri, request::Builder};
use http::{HeaderName, HeaderValue};
@@ -15,7 +14,7 @@ use parking_lot::Mutex;
use serde::Serialize;
#[cfg(feature = "test-support")]
use std::{any::type_name, fmt};
use std::{sync::Arc, time::Duration};
use std::{ops::Deref, sync::Arc, time::Duration};
pub use url::{Host, Url};
#[derive(Default, Debug, Clone, PartialEq, Eq, Hash)]
@@ -175,9 +174,7 @@ pub trait HttpClient: 'static + Send + Sync {
}
/// An [`HttpClient`] that may have a proxy.
#[derive(Deref)]
pub struct HttpClientWithProxy {
#[deref]
client: Arc<dyn HttpClient>,
proxy: Option<Url>,
}
@@ -199,6 +196,15 @@ impl HttpClientWithProxy {
}
}
impl Deref for HttpClientWithProxy {
type Target = Arc<dyn HttpClient>;
#[inline]
fn deref(&self) -> &Self::Target {
&self.client
}
}
impl HttpClient for HttpClientWithProxy {
fn send(
&self,
@@ -222,10 +228,8 @@ impl HttpClient for HttpClientWithProxy {
}
/// An [`HttpClient`] that has a base URL.
#[derive(Deref)]
pub struct HttpClientWithUrl {
base_url: Mutex<String>,
#[deref]
client: HttpClientWithProxy,
}
@@ -332,6 +336,15 @@ impl HttpClientWithUrl {
}
}
impl Deref for HttpClientWithUrl {
type Target = HttpClientWithProxy;
#[inline]
fn deref(&self) -> &Self::Target {
&self.client
}
}
impl HttpClient for HttpClientWithUrl {
fn send(
&self,
+1 -1
View File
@@ -17,7 +17,7 @@ doctest = false
test = false
[dependencies]
log.workspace = true
log = { workspace = true, features = ["serde"] }
rustls.workspace = true
rustls-platform-verifier.workspace = true
webpki-roots.workspace = true
+1 -1
View File
@@ -27,7 +27,7 @@ base64.workspace = true
futures.workspace = true
httparse.workspace = true
idna.workspace = true
log.workspace = true
log = { workspace = true, features = ["serde"] }
percent-encoding.workspace = true
proxyvars.workspace = true
thiserror.workspace = true
+1 -1
View File
@@ -13,5 +13,5 @@ path = "src/icons.rs"
doctest = false
[dependencies]
serde.workspace = true
serde = { workspace = true, features = ["derive"] }
strum.workspace = true
-1
View File
@@ -25,7 +25,6 @@ serde_json_lenient.workspace = true
theme_settings.workspace = true
ui.workspace = true
util.workspace = true
util_macros.workspace = true
workspace.workspace = true
zed_actions.workspace = true
+5 -1
View File
@@ -29,7 +29,11 @@ use util::split_str_with_ranges;
/// Path used for unsaved buffer that contains style json. To support the json language server, this
/// matches the name used in the generated schemas.
const ZED_INSPECTOR_STYLE_JSON: &str = util_macros::path!("/zed-inspector-style.json");
const ZED_INSPECTOR_STYLE_JSON: &str = if cfg!(target_os = "windows") {
r"C:\zed-inspector-style.json"
} else {
"/zed-inspector-style.json"
};
pub(crate) struct DivInspector {
state: State,
+2
View File
@@ -24,4 +24,6 @@ log.workspace = true
release_channel.workspace = true
smol.workspace = true
util.workspace = true
[target.'cfg(not(target_os = "windows"))'.dependencies]
workspace.workspace = true
+2 -3
View File
@@ -50,7 +50,7 @@ itertools.workspace = true
log.workspace = true
lsp.workspace = true
parking_lot.workspace = true
postage.workspace = true
postage = { workspace = true, features = ["futures-traits", "logging", "blocking"] }
rand = { workspace = true, optional = true }
regex.workspace = true
rpc.workspace = true
@@ -66,7 +66,6 @@ sum_tree.workspace = true
task.workspace = true
text.workspace = true
theme.workspace = true
toml.workspace = true
tracing.workspace = true
grammars = { workspace = true, optional = true }
tree-sitter-json = { workspace = true, optional = true }
@@ -75,7 +74,7 @@ tree-sitter-python = { workspace = true, optional = true }
tree-sitter-rust = { workspace = true, optional = true }
tree-sitter-typescript = { workspace = true, optional = true }
tree-sitter = { workspace = true, features = ["wasm"] }
unicase = "2.6"
unicase.workspace = true
util.workspace = true
watch.workspace = true
zlog.workspace = true
-5
View File
@@ -1,5 +0,0 @@
fn main() {
if let Ok(bundled) = std::env::var("ZED_BUNDLE") {
println!("cargo:rustc-env=ZED_BUNDLE={}", bundled);
}
}
+3 -3
View File
@@ -18,9 +18,9 @@ log.workspace = true
lru.workspace = true
parking_lot.workspace = true
path.workspace = true
regex.workspace = true
schemars.workspace = true
serde.workspace = true
regex = { workspace = true, default-features = true }
schemars = { workspace = true, features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
smallvec.workspace = true
strum.workspace = true
+4 -5
View File
@@ -17,21 +17,20 @@ cloud_llm_client.workspace = true
collections.workspace = true
futures.workspace = true
gpui_shared_string.workspace = true
http_client.workspace = true
http.workspace = true
log.workspace = true
partial-json-fixer.workspace = true
schemars.workspace = true
schemars = { workspace = true, features = ["derive"] }
serde.workspace = true
serde_json.workspace = true
strum.workspace = true
thiserror.workspace = true
[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
# Workspace inheritance would re-enable defaults, including blocking synchronization.
async-lock = { version = "3.4.2", default-features = false }
async-lock.workspace = true
[target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
async-lock.workspace = true
async-lock = { workspace = true, features = ["std"] }
[dev-dependencies]
pretty_assertions.workspace = true
@@ -8,7 +8,7 @@ pub mod util;
use anyhow::{Context as _, Result, anyhow};
use cloud_llm_client::CompletionRequestStatus;
use http_client::{StatusCode, http};
use http::StatusCode;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use std::ops::{Add, Sub};
@@ -9,6 +9,7 @@ pub const OPEN_AI_PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId
pub const OPEN_AI_PROVIDER_NAME: LanguageModelProviderName =
LanguageModelProviderName::new("OpenAI");
pub const GOOGLE_AI_API_URL: &str = "https://generativelanguage.googleapis.com";
pub const GOOGLE_PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("google");
pub const GOOGLE_PROVIDER_NAME: LanguageModelProviderName =
LanguageModelProviderName::new("Google AI");
+3 -3
View File
@@ -19,8 +19,8 @@ test-support = []
ai_onboarding.workspace = true
anthropic = { workspace = true, features = ["schemars"] }
anyhow.workspace = true
aws-config = { workspace = true, features = ["behavior-version-latest"] }
aws-credential-types = { workspace = true, features = ["hardcoded-credentials"] }
aws-config.workspace = true
aws-credential-types.workspace = true
aws-sigv4.workspace = true
aws_http_client.workspace = true
base64.workspace = true
@@ -54,7 +54,7 @@ ollama = { workspace = true, features = ["schemars"] }
open_ai = { workspace = true, features = ["schemars"] }
openai_subscribed.workspace = true
opencode = { workspace = true, features = ["schemars"] }
open_router = { workspace = true, features = ["schemars"] }
open_router.workspace = true
paths.workspace = true
rand.workspace = true
release_channel.workspace = true
+1 -1
View File
@@ -71,7 +71,7 @@ util.workspace = true
fs = { workspace = true, features = ["test-support"] }
language = { workspace = true, features = ["test-support"] }
pretty_assertions.workspace = true
tempfile = { workspace = true}
tempfile.workspace = true
settings = { workspace = true, features = ["test-support"] }
theme = { workspace = true, features = ["test-support"] }
tree-sitter-bash.workspace = true
+2 -2
View File
@@ -20,10 +20,10 @@ test-support = []
anyhow.workspace = true
async-trait.workspace = true
jsonwebtoken = { workspace = true, features = ["aws_lc_rs"] }
log.workspace = true
log = { workspace = true, features = ["serde"] }
prost.workspace = true
prost-types.workspace = true
reqwest.workspace = true
reqwest = { workspace = true, features = ["charset"] }
serde.workspace = true
[build-dependencies]
+9 -5
View File
@@ -17,7 +17,7 @@ doctest = false
name = "test_app"
[features]
test-support = ["collections/test-support", "gpui/test-support", "livekit_api/test-support"]
test-support = ["collections/test-support", "gpui/test-support", "livekit_api/test-support", "dep:nanoid", "dep:postage"]
[dependencies]
anyhow.workspace = true
@@ -32,9 +32,9 @@ http_client_tls.workspace = true
image.workspace = true
livekit_api = { workspace = true, optional = true }
log.workspace = true
nanoid.workspace = true
nanoid = { workspace = true, optional = true }
parking_lot.workspace = true
postage.workspace = true
postage = { workspace = true, optional = true, features = ["futures-traits", "logging", "blocking"] }
rodio.workspace = true
serde.workspace = true
serde_urlencoded.workspace = true
@@ -45,6 +45,8 @@ util.workspace = true
[target.'cfg(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd"))'.dependencies]
livekit_api.workspace = true
nanoid.workspace = true
postage = { workspace = true, features = ["futures-traits", "logging", "blocking"] }
[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
libwebrtc.workspace = true
@@ -61,17 +63,19 @@ scap.workspace = true
core-foundation.workspace = true
core-video.workspace = true
objc2-core-foundation.workspace = true
coreaudio-rs = "0.12.1"
coreaudio-rs = { workspace = true, features = ["core_audio"] }
[dev-dependencies]
collections = { workspace = true, features = ["test-support"] }
gpui = { workspace = true, features = ["test-support"] }
gpui_platform.workspace = true
livekit_api = { workspace = true, features = ["test-support"] }
nanoid.workspace = true
postage = { workspace = true, features = ["futures-traits", "logging"] }
simplelog.workspace = true
[build-dependencies]
serde.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
[package.metadata.cargo-shear]
+1 -1
View File
@@ -17,7 +17,7 @@ test-support = ["async-pipe"]
[dependencies]
anyhow.workspace = true
async-channel.workspace = true
async-channel = { workspace = true, features = ["std"] }
async-pipe = { workspace = true, optional = true }
collections.workspace = true
futures-lite.workspace = true
+1 -1
View File
@@ -28,7 +28,7 @@ language.workspace = true
linkify.workspace = true
log.workspace = true
markup5ever_rcdom.workspace = true
mermaid_render = { path = "../mermaid_render" }
mermaid_render.workspace = true
pulldown-cmark.workspace = true
settings.workspace = true
smallvec.workspace = true
+2 -2
View File
@@ -18,7 +18,7 @@ test-support = []
[dependencies]
anyhow.workspace = true
gpui.workspace = true
merman = { version = "=0.8.0-alpha.5", default-features = false, features = [
merman = { workspace = true, features = [
"layout-cytoscape",
"svg",
] }
@@ -29,7 +29,7 @@ ztracing.workspace = true
[dev-dependencies]
gpui = { workspace = true, features = ["test-support"] }
mermaid_render = { path = ".", features = ["test-support"] }
mermaid_render = { workspace = true, features = ["test-support"] }
usvg.workspace = true
[package.metadata.cargo-shear]
-3
View File
@@ -24,6 +24,3 @@ workspace.workspace = true
util.workspace = true
serde_json.workspace = true
smol.workspace = true
[dev-dependencies]
gpui = { workspace = true, features = ["test-support"] }
+1 -1
View File
@@ -21,7 +21,7 @@ schemars = ["dep:schemars"]
anyhow.workspace = true
futures.workspace = true
http_client.workspace = true
schemars = { workspace = true, optional = true }
schemars = { workspace = true, features = ["derive"], optional = true }
serde.workspace = true
serde_json.workspace = true
strum.workspace = true
+2 -2
View File
@@ -16,8 +16,8 @@ doctest = false
smol.workspace = true
[target.'cfg(target_os = "windows")'.dependencies]
async-io = "2.4"
windows.workspace = true
async-io.workspace = true
windows = { workspace = true, features = ["Win32_Networking_WinSock"] }
[dev-dependencies]
tempfile.workspace = true
+1 -1
View File
@@ -20,7 +20,7 @@ anyhow.workspace = true
async-compression.workspace = true
async-tar.workspace = true
async-trait.workspace = true
chrono.workspace = true
chrono = { workspace = true, default-features = true }
futures.workspace = true
http_client.workspace = true
log.workspace = true
-6
View File
@@ -36,11 +36,5 @@ util.workspace = true
workspace.workspace = true
zed_actions.workspace = true
[dev-dependencies]
client = { workspace = true, features = ["test-support"] }
gpui = { workspace = true, features = ["test-support"] }
rpc = { workspace = true, features = ["test-support"] }
util = { workspace = true, features = ["test-support"] }
[package.metadata.cargo-shear]
ignored = ["component"]
+1 -1
View File
@@ -19,6 +19,6 @@ anyhow.workspace = true
[target.'cfg(not(target_family = "wasm"))'.dependencies]
futures.workspace = true
log.workspace = true
log = { workspace = true, features = ["serde"] }
tiny_http.workspace = true
url.workspace = true
+1 -1
View File
@@ -23,4 +23,4 @@ http_client.workspace = true
schemars = { workspace = true, optional = true }
serde.workspace = true
serde_json.workspace = true
settings.workspace = true
settings_content.workspace = true
+1 -1
View File
@@ -7,7 +7,7 @@ use http_client::{
};
use serde::{Deserialize, Serialize};
use serde_json::Value;
pub use settings::KeepAlive;
pub use settings_content::KeepAlive;
pub const OLLAMA_API_URL: &str = "http://localhost:11434";
+1 -1
View File
@@ -22,7 +22,7 @@ collections.workspace = true
futures.workspace = true
http_client.workspace = true
language_model_core.workspace = true
rand.workspace = true
rand = { workspace = true, features = ["small_rng", "thread_rng"] }
schemars = { workspace = true, optional = true }
log.workspace = true
serde.workspace = true
+1 -1
View File
@@ -18,6 +18,7 @@ base64.workspace = true
credentials_provider.workspace = true
futures.workspace = true
gpui.workspace = true
gpui_util.workspace = true
http_client.workspace = true
language_model.workspace = true
log.workspace = true
@@ -29,7 +30,6 @@ serde_json.workspace = true
sha2.workspace = true
smol.workspace = true
url.workspace = true
util.workspace = true
[dev-dependencies]
gpui = { workspace = true, features = ["test-support"] }
@@ -4,6 +4,7 @@ use base64::engine::general_purpose::URL_SAFE_NO_PAD;
use credentials_provider::CredentialsProvider;
use futures::{FutureExt, StreamExt, future::BoxFuture, future::Shared};
use gpui::{AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
use gpui_util::ResultExt as _;
use http_client::{
AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest, RequestBuilderExt as _,
http::{HeaderName, HeaderValue},
@@ -24,7 +25,6 @@ use sha2::{Digest, Sha256};
use std::sync::Arc;
use std::time::{Duration, SystemTime, UNIX_EPOCH};
use url::form_urlencoded;
use util::ResultExt as _;
use open_ai::completion::{OpenAiResponseEventMapper, into_open_ai_response};
+4 -1
View File
@@ -15,7 +15,10 @@ test-support = []
[dependencies]
anyhow.workspace = true
dunce.workspace = true
serde = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive"], optional = true }
[target.'cfg(windows)'.dependencies]
tendril.workspace = true
[dev-dependencies]
tempfile.workspace = true
+34
View File
@@ -6,11 +6,17 @@
//!
//! Adapted from Zed's `util::rel_path` module.
#[cfg(windows)]
use anyhow::Context;
#[cfg(all(unix, not(target_family = "wasm")))]
use std::os::unix::prelude::OsStrExt;
use std::{
borrow::Cow,
ffi::OsStr,
path::{Path, PathBuf},
};
#[cfg(windows)]
use tendril::fmt::{Format, WTF8};
use crate::path_component::{Component, Components, Prefix, PrefixExt, iter_after};
use crate::rel_path::RelPath;
@@ -20,6 +26,34 @@ mod path_component;
pub mod rel_path;
mod windows_prefix;
pub fn try_from_bytes<'a, T>(bytes: &'a [u8]) -> anyhow::Result<T>
where
T: From<&'a Path>,
{
#[cfg(target_family = "wasm")]
{
std::str::from_utf8(bytes)
.map(Path::new)
.map(Into::into)
.map_err(Into::into)
}
#[cfg(all(unix, not(target_family = "wasm")))]
{
Ok(T::from(Path::new(OsStr::from_bytes(bytes))))
}
#[cfg(windows)]
{
WTF8::validate(bytes)
.then(|| {
// Safety: bytes are valid WTF-8 sequence.
T::from(Path::new(unsafe {
OsStr::from_encoded_bytes_unchecked(bytes)
}))
})
.with_context(|| format!("Invalid WTF-8 sequence: {bytes:?}"))
}
}
pub trait PathExt {
fn to_rel_path_buf(&self) -> anyhow::Result<rel_path::RelPathBuf>;
}
-1
View File
@@ -41,7 +41,6 @@ async-lock.workspace = true
async-trait.workspace = true
base64.workspace = true
buffer_diff.workspace = true
circular-buffer.workspace = true
client.workspace = true
clock.workspace = true
collections.workspace = true
+5 -2
View File
@@ -700,7 +700,7 @@ pub struct Session {
child_session_ids: HashSet<SessionId>,
parent_session: Option<Entity<Session>>,
output_token: OutputToken,
output: Box<circular_buffer::CircularBuffer<MAX_TRACKED_OUTPUT_EVENTS, dap::OutputEvent>>,
output: VecDeque<dap::OutputEvent>,
watchers: HashMap<SharedString, Watcher>,
is_session_terminated: bool,
requests: TypeIdHashMap<HashMap<RequestSlot, Shared<Task<Option<()>>>>>,
@@ -874,7 +874,7 @@ impl Session {
capabilities: Capabilities::default(),
watchers: HashMap::default(),
output_token: OutputToken(0),
output: circular_buffer::CircularBuffer::boxed(),
output: VecDeque::with_capacity(MAX_TRACKED_OUTPUT_EVENTS),
requests: Default::default(),
background_tasks: Vec::default(),
restart_task: None,
@@ -1786,6 +1786,9 @@ impl Session {
}
fn push_output(&mut self, event: OutputEvent) {
if self.output.len() == MAX_TRACKED_OUTPUT_EVENTS {
self.output.pop_front();
}
self.output.push_back(event);
self.output_token.0 += 1;
}
+1 -1
View File
@@ -27,7 +27,6 @@ git.workspace = true
gpui.workspace = true
itertools.workspace = true
menu.workspace = true
pretty_assertions.workspace = true
project.workspace = true
schemars.workspace = true
serde.workspace = true
@@ -58,6 +57,7 @@ editor = { workspace = true, features = ["test-support"] }
git_ui = { workspace = true, features = ["test-support"] }
gpui = { workspace = true, features = ["test-support"] }
language = { workspace = true, features = ["test-support"] }
pretty_assertions.workspace = true
serde_json.workspace = true
tempfile.workspace = true
workspace = { workspace = true, features = ["test-support"] }
+1 -1
View File
@@ -19,7 +19,7 @@ doctest = false
[dependencies]
anyhow.workspace = true
prost.workspace = true
serde.workspace = true
serde = { workspace = true, features = ["derive"] }
[build-dependencies]
prost-build.workspace = true
@@ -19,4 +19,4 @@ test = false
[dependencies]
proc-macro2.workspace = true
quote.workspace = true
syn.workspace = true
syn = { workspace = true, default-features = true }
+3 -5
View File
@@ -24,10 +24,10 @@ askpass.workspace = true
async-trait.workspace = true
base64.workspace = true
collections.workspace = true
fs.workspace = true
fs = { workspace = true, optional = true }
futures.workspace = true
gpui.workspace = true
log.workspace = true
log = { workspace = true, features = ["kv_unstable_std"] }
parking_lot.workspace = true
paths.workspace = true
release_channel.workspace = true
@@ -36,7 +36,7 @@ schemars.workspace = true
semver.workspace = true
serde.workspace = true
serde_json.workspace = true
settings.workspace = true
settings_content.workspace = true
smol.workspace = true
telemetry.workspace = true
tempfile.workspace = true
@@ -47,5 +47,3 @@ which.workspace = true
[dev-dependencies]
gpui = { workspace = true, features = ["test-support"] }
fs = { workspace = true, features = ["test-support"] }
util = { workspace = true, features = ["test-support"] }
+3 -3
View File
@@ -17,7 +17,7 @@ use paths::remote_server_dir_relative;
use release_channel::{AppVersion, ReleaseChannel};
use rpc::proto::Envelope;
use semver::Version;
pub use settings::SshPortForwardOption;
pub use settings_content::SshPortForwardOption;
use smol::fs;
use std::{
net::IpAddr,
@@ -147,8 +147,8 @@ pub struct SshConnectionOptions {
pub upload_binary_over_ssh: bool,
}
impl From<settings::SshConnection> for SshConnectionOptions {
fn from(val: settings::SshConnection) -> Self {
impl From<settings_content::SshConnection> for SshConnectionOptions {
fn from(val: settings_content::SshConnection) -> Self {
SshConnectionOptions {
host: val.host.to_string().into(),
username: val.username,
+2 -2
View File
@@ -39,8 +39,8 @@ pub struct WslConnectionOptions {
pub user: Option<String>,
}
impl From<settings::WslConnection> for WslConnectionOptions {
fn from(val: settings::WslConnection) -> Self {
impl From<settings_content::WslConnection> for WslConnectionOptions {
fn from(val: settings_content::WslConnection) -> Self {
WslConnectionOptions {
distro_name: val.distro_name,
user: val.user,
+2 -3
View File
@@ -22,7 +22,6 @@ debug-embed = ["dep:rust-embed", "util/debug-embed"]
test-support = ["fs/test-support"]
[dependencies]
acp_thread.workspace = true
anyhow.workspace = true
async-channel.workspace = true
askpass.workspace = true
@@ -81,6 +80,7 @@ windows.workspace = true
gpui = { workspace = true, features = ["windows-manifest"] }
[dev-dependencies]
acp_thread.workspace = true
action_log.workspace = true
agent = { workspace = true, features = ["test-support"] }
agent-client-protocol.workspace = true
@@ -106,8 +106,7 @@ workspace = { workspace = true, features = ["test-support"] }
zlog.workspace = true
[build-dependencies]
cargo_toml.workspace = true
toml.workspace = true
toml_edit.workspace = true
[package.metadata.cargo-shear]
ignored = ["rust-embed"]
+8 -6
View File
@@ -4,12 +4,14 @@ use std::process::Command;
const ZED_MANIFEST: &str = include_str!("../zed/Cargo.toml");
fn main() {
let zed_cargo_toml: cargo_toml::Manifest =
toml::from_str(ZED_MANIFEST).expect("failed to parse zed Cargo.toml");
println!(
"cargo:rustc-env=ZED_PKG_VERSION={}",
zed_cargo_toml.package.unwrap().version.unwrap()
);
let zed_cargo_toml =
toml_edit::ImDocument::parse(ZED_MANIFEST).expect("failed to parse zed Cargo.toml");
let version = zed_cargo_toml
.get("package")
.and_then(|package| package.get("version"))
.and_then(toml_edit::Item::as_str)
.expect("zed Cargo.toml must declare a package version string");
println!("cargo:rustc-env=ZED_PKG_VERSION={version}");
println!(
"cargo:rustc-env=TARGET={}",
std::env::var("TARGET").unwrap()

Some files were not shown because too many files have changed in this diff Show More