summaryrefslogtreecommitdiff
path: root/editors/zed
diff options
context:
space:
mode:
Diffstat (limited to 'editors/zed')
-rw-r--r--editors/zed/Makefile2
-rw-r--r--editors/zed/Makefile.crates8
-rw-r--r--editors/zed/distinfo22
-rw-r--r--editors/zed/files/patch-Cargo.lock16
-rw-r--r--editors/zed/files/patch-crates_fs_src_fs.rs8
-rw-r--r--editors/zed/files/patch-crates_project_src_agent__server__store.rs6
-rw-r--r--editors/zed/files/patch-crates_remote__server_src_unix.rs6
-rw-r--r--editors/zed/files/patch-crates_remote_src_transport_ssh.rs40
-rw-r--r--editors/zed/files/patch-crates_zed_src_main.rs12
9 files changed, 60 insertions, 60 deletions
diff --git a/editors/zed/Makefile b/editors/zed/Makefile
index 15746422d56d..749f8e4423b8 100644
--- a/editors/zed/Makefile
+++ b/editors/zed/Makefile
@@ -1,6 +1,6 @@
PORTNAME= zed
DISTVERSIONPREFIX= v
-DISTVERSION= 0.215.3
+DISTVERSION= 0.216.1
CATEGORIES= editors
PKGNAMESUFFIX= -editor
diff --git a/editors/zed/Makefile.crates b/editors/zed/Makefile.crates
index 98ef50174632..aba971c2fbf0 100644
--- a/editors/zed/Makefile.crates
+++ b/editors/zed/Makefile.crates
@@ -1,8 +1,8 @@
CARGO_CRATES= addr2line-0.25.1 \
adler2-2.0.1 \
aes-0.8.4 \
- agent-client-protocol-0.7.0 \
- agent-client-protocol-schema-0.6.2 \
+ agent-client-protocol-0.8.0 \
+ agent-client-protocol-schema-0.9.1 \
ahash-0.7.8 \
ahash-0.8.12 \
aho-corasick-1.1.3 \
@@ -1153,7 +1153,7 @@ CARGO_CRATES= addr2line-0.25.1 \
trait-variant-0.1.2 \
transpose-0.2.3 \
tree-sitter-0.25.10 \
- tree-sitter-bash-0.25.0 \
+ tree-sitter-bash-0.25.1 \
tree-sitter-c-0.23.4 \
tree-sitter-css-0.23.2 \
tree-sitter-diff-0.1.0 \
@@ -1439,13 +1439,13 @@ CARGO_CRATES= addr2line-0.25.1 \
zvariant-5.8.0 \
zvariant_derive-5.8.0 \
zvariant_utils-3.2.1 \
- gh-workflow,gh-workflow-macros@git+https://github.com/zed-industries/gh-workflow?rev=3eaa84abca0778eb54272f45a312cb24f9a0b435\#3eaa84abca0778eb54272f45a312cb24f9a0b435 \
candle-core,candle-nn,candle-onnx@git+https://github.com/zed-industries/candle?branch=9.1-patched\#724d75eb3deebefe83f2a7381a45d4fac6eda383 \
tree-sitter-md@git+https://github.com/tree-sitter-grammars/tree-sitter-markdown?rev=9a23c1a96c0513d8fc6520972beedd419a973539\#9a23c1a96c0513d8fc6520972beedd419a973539 \
windows-capture@git+https://github.com/zed-industries/windows-capture.git?rev=f0d6c1b6691db75461b732f6d5ff56eed002eeb9\#f0d6c1b6691db75461b732f6d5ff56eed002eeb9 \
tree-sitter-gomod@git+https://github.com/camdencheek/tree-sitter-go-mod?rev=2e886870578eeba1927a2dc4bd2e2b3f598c5f9a\#2e886870578eeba1927a2dc4bd2e2b3f598c5f9a \
rodio@git+https://github.com/RustAudio/rodio?rev=e2074c6c2acf07b57cf717e076bdda7a9ac6e70b\#e2074c6c2acf07b57cf717e076bdda7a9ac6e70b \
lsp-types@git+https://github.com/zed-industries/lsp-types?rev=b71ab4eeb27d9758be8092020a46fe33fbca4e33\#b71ab4eeb27d9758be8092020a46fe33fbca4e33 \
+ gh-workflow,gh-workflow-macros@git+https://github.com/zed-industries/gh-workflow?rev=09acfdf2bd5c1d6254abefd609c808ff73547b2c\#09acfdf2bd5c1d6254abefd609c808ff73547b2c \
zed-scap@git+https://github.com/zed-industries/scap?rev=4afea48c3b002197176fb19cd0f9b180dd36eaac\#4afea48c3b002197176fb19cd0f9b180dd36eaac \
tiktoken-rs@git+https://github.com/zed-industries/tiktoken-rs?rev=7249f999c5fdf9bf3cc5c288c964454e4dac0c00\#7249f999c5fdf9bf3cc5c288c964454e4dac0c00 \
tree-sitter-gitcommit@git+https://github.com/zed-industries/tree-sitter-git-commit?rev=88309716a69dd13ab83443721ba6e0b491d37ee9\#88309716a69dd13ab83443721ba6e0b491d37ee9 \
diff --git a/editors/zed/distinfo b/editors/zed/distinfo
index 7ed7cb68c44d..c931258626aa 100644
--- a/editors/zed/distinfo
+++ b/editors/zed/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1765355967
+TIMESTAMP = 1765605659
SHA256 (rust/crates/addr2line-0.25.1.crate) = 1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b
SIZE (rust/crates/addr2line-0.25.1.crate) = 43134
SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa
SIZE (rust/crates/adler2-2.0.1.crate) = 13366
SHA256 (rust/crates/aes-0.8.4.crate) = b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0
SIZE (rust/crates/aes-0.8.4.crate) = 124812
-SHA256 (rust/crates/agent-client-protocol-0.7.0.crate) = 525705e39c11cd73f7bc784e3681a9386aa30c8d0630808d3dc2237eb4f9cb1b
-SIZE (rust/crates/agent-client-protocol-0.7.0.crate) = 30061
-SHA256 (rust/crates/agent-client-protocol-schema-0.6.2.crate) = ecf16c18fea41282d6bbadd1549a06be6836bddb1893f44a6235f340fa24e2af
-SIZE (rust/crates/agent-client-protocol-schema-0.6.2.crate) = 36370
+SHA256 (rust/crates/agent-client-protocol-0.8.0.crate) = 3e639d6b544ad39f5b4e05802db5eb04e1518284eb05fda1839931003e0244c8
+SIZE (rust/crates/agent-client-protocol-0.8.0.crate) = 26819
+SHA256 (rust/crates/agent-client-protocol-schema-0.9.1.crate) = f182f5e14bef8232b239719bd99166bb11e986c08fc211f28e392f880d3093ba
+SIZE (rust/crates/agent-client-protocol-schema-0.9.1.crate) = 43781
SHA256 (rust/crates/ahash-0.7.8.crate) = 891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9
SIZE (rust/crates/ahash-0.7.8.crate) = 38550
SHA256 (rust/crates/ahash-0.8.12.crate) = 5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75
@@ -2309,8 +2309,8 @@ SHA256 (rust/crates/transpose-0.2.3.crate) = 1ad61aed86bc3faea4300c7aee358b4c6d0
SIZE (rust/crates/transpose-0.2.3.crate) = 10913
SHA256 (rust/crates/tree-sitter-0.25.10.crate) = 78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87
SIZE (rust/crates/tree-sitter-0.25.10.crate) = 197383
-SHA256 (rust/crates/tree-sitter-bash-0.25.0.crate) = 871b0606e667e98a1237ebdc1b0d7056e0aebfdc3141d12b399865d4cb6ed8a6
-SIZE (rust/crates/tree-sitter-bash-0.25.0.crate) = 443064
+SHA256 (rust/crates/tree-sitter-bash-0.25.1.crate) = 9e5ec769279cc91b561d3df0d8a5deb26b0ad40d183127f409494d6d8fc53062
+SIZE (rust/crates/tree-sitter-bash-0.25.1.crate) = 438310
SHA256 (rust/crates/tree-sitter-c-0.23.4.crate) = afd2b1bf1585dc2ef6d69e87d01db8adb059006649dd5f96f31aa789ee6e9c71
SIZE (rust/crates/tree-sitter-c-0.23.4.crate) = 247226
SHA256 (rust/crates/tree-sitter-css-0.23.2.crate) = 5ad6489794d41350d12a7fbe520e5199f688618f43aace5443980d1ddcf1b29e
@@ -2881,8 +2881,6 @@ SHA256 (rust/crates/zvariant_derive-5.8.0.crate) = da58575a1b2b20766513b1ec59d8e
SIZE (rust/crates/zvariant_derive-5.8.0.crate) = 14336
SHA256 (rust/crates/zvariant_utils-3.2.1.crate) = c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599
SIZE (rust/crates/zvariant_utils-3.2.1.crate) = 14678
-SHA256 (zed-industries-gh-workflow-3eaa84abca0778eb54272f45a312cb24f9a0b435_GH0.tar.gz) = cb6f9140ecaa04aa92c4992a311a3d766390a34a04fd24d72ee3d0d0b66db211
-SIZE (zed-industries-gh-workflow-3eaa84abca0778eb54272f45a312cb24f9a0b435_GH0.tar.gz) = 44510
SHA256 (zed-industries-candle-724d75eb3deebefe83f2a7381a45d4fac6eda383_GH0.tar.gz) = d116c435d4d8551f53389f411da02ce433c76f52809533300042ffe82b61df3e
SIZE (zed-industries-candle-724d75eb3deebefe83f2a7381a45d4fac6eda383_GH0.tar.gz) = 3072184
SHA256 (tree-sitter-grammars-tree-sitter-markdown-9a23c1a96c0513d8fc6520972beedd419a973539_GH0.tar.gz) = 429dc5952b47034346eed7689f677b014e99502c9f478a3987c5d683ef3e6475
@@ -2895,6 +2893,8 @@ SHA256 (RustAudio-rodio-e2074c6c2acf07b57cf717e076bdda7a9ac6e70b_GH0.tar.gz) = 0
SIZE (RustAudio-rodio-e2074c6c2acf07b57cf717e076bdda7a9ac6e70b_GH0.tar.gz) = 15032672
SHA256 (zed-industries-lsp-types-b71ab4eeb27d9758be8092020a46fe33fbca4e33_GH0.tar.gz) = d48cb935cb50ffccbafa8323e815dd220f0b829be245b4fa562ded3a09cc9c79
SIZE (zed-industries-lsp-types-b71ab4eeb27d9758be8092020a46fe33fbca4e33_GH0.tar.gz) = 74361
+SHA256 (zed-industries-gh-workflow-09acfdf2bd5c1d6254abefd609c808ff73547b2c_GH0.tar.gz) = 9e28ce01a44e2fc63ddbaf5045924c8e6de8595f53d933e47786ee23f9b7fe8e
+SIZE (zed-industries-gh-workflow-09acfdf2bd5c1d6254abefd609c808ff73547b2c_GH0.tar.gz) = 44984
SHA256 (zed-industries-scap-4afea48c3b002197176fb19cd0f9b180dd36eaac_GH0.tar.gz) = 48f60b164435404d1389a090f7a2d06e43acc87c1abba3799109d20f171e7e1d
SIZE (zed-industries-scap-4afea48c3b002197176fb19cd0f9b180dd36eaac_GH0.tar.gz) = 5161737
SHA256 (zed-industries-tiktoken-rs-7249f999c5fdf9bf3cc5c288c964454e4dac0c00_GH0.tar.gz) = b30a099ea15c34663648df1b17dec0ecaa4f230ef57690f01f1d0e8b2fdde48e
@@ -2931,5 +2931,5 @@ SHA256 (zed-industries-tree-sitter-yaml-baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a
SIZE (zed-industries-tree-sitter-yaml-baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a_GH0.tar.gz) = 145319
SHA256 (zed-industries-calloop-eb6b4fd17b9af5ecc226546bdd04185391b3e265_GH0.tar.gz) = 8698ebc194a6c3ee377cde94f4fdff590f6a7973bc7987c880801fa7fd69e5c3
SIZE (zed-industries-calloop-eb6b4fd17b9af5ecc226546bdd04185391b3e265_GH0.tar.gz) = 94768
-SHA256 (zed-industries-zed-v0.215.3_GH0.tar.gz) = dc38427f180123fb82c2af28c1f91ef70df7512c4e5c503a0214f1dede2038ff
-SIZE (zed-industries-zed-v0.215.3_GH0.tar.gz) = 22308904
+SHA256 (zed-industries-zed-v0.216.1_GH0.tar.gz) = e392f32e2b2d1c3d1251872633a4b6d9abeb633df83346f2d58cc432820338fd
+SIZE (zed-industries-zed-v0.216.1_GH0.tar.gz) = 22368372
diff --git a/editors/zed/files/patch-Cargo.lock b/editors/zed/files/patch-Cargo.lock
index 31200c6963fe..1752a65915d6 100644
--- a/editors/zed/files/patch-Cargo.lock
+++ b/editors/zed/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig 2025-12-03 16:43:47 UTC
+--- Cargo.lock.orig 2025-12-11 21:24:05 UTC
+++ Cargo.lock
-@@ -8374,21 +8374,20 @@ name = "ipc-channel"
+@@ -8382,21 +8382,20 @@ name = "ipc-channel"
[[package]]
name = "ipc-channel"
@@ -26,7 +26,7 @@
]
[[package]]
-@@ -19846,16 +19845,6 @@ name = "windows"
+@@ -19858,16 +19857,6 @@ name = "windows"
[[package]]
name = "windows"
@@ -43,7 +43,7 @@
version = "0.61.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
-@@ -19914,19 +19903,6 @@ name = "windows-core"
+@@ -19926,19 +19915,6 @@ name = "windows-core"
[[package]]
name = "windows-core"
@@ -63,7 +63,7 @@
version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-@@ -19975,17 +19951,6 @@ name = "windows-implement"
+@@ -19987,17 +19963,6 @@ name = "windows-implement"
[[package]]
name = "windows-implement"
@@ -81,7 +81,7 @@
version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
-@@ -20008,17 +19973,6 @@ name = "windows-interface"
+@@ -20020,17 +19985,6 @@ name = "windows-interface"
[[package]]
name = "windows-interface"
@@ -99,7 +99,7 @@
version = "0.59.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
-@@ -20094,15 +20048,6 @@ name = "windows-result"
+@@ -20106,15 +20060,6 @@ name = "windows-result"
[[package]]
name = "windows-result"
@@ -115,7 +115,7 @@
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-@@ -20117,16 +20062,6 @@ dependencies = [
+@@ -20129,16 +20074,6 @@ dependencies = [
checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
dependencies = [
"windows-link 0.2.1",
diff --git a/editors/zed/files/patch-crates_fs_src_fs.rs b/editors/zed/files/patch-crates_fs_src_fs.rs
index d1f3e4c6670b..1a8d5b39261b 100644
--- a/editors/zed/files/patch-crates_fs_src_fs.rs
+++ b/editors/zed/files/patch-crates_fs_src_fs.rs
@@ -1,6 +1,6 @@
---- crates/fs/src/fs.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/fs/src/fs.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/fs/src/fs.rs
-@@ -358,7 +358,7 @@ impl FileHandle for std::fs::File {
+@@ -360,7 +360,7 @@ impl FileHandle for std::fs::File {
Ok(new_path)
}
@@ -9,7 +9,7 @@
fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
use std::{
ffi::{CStr, OsStr},
-@@ -367,7 +367,10 @@ impl FileHandle for std::fs::File {
+@@ -369,7 +369,10 @@ impl FileHandle for std::fs::File {
let fd = self.as_fd();
let mut kif = MaybeUninit::<libc::kinfo_file>::uninit();
@@ -21,7 +21,7 @@
let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, kif.as_mut_ptr()) };
if result == -1 {
-@@ -378,6 +381,11 @@ impl FileHandle for std::fs::File {
+@@ -380,6 +383,11 @@ impl FileHandle for std::fs::File {
let c_str = unsafe { CStr::from_ptr(kif.assume_init().kf_path.as_ptr()) };
let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
Ok(path)
diff --git a/editors/zed/files/patch-crates_project_src_agent__server__store.rs b/editors/zed/files/patch-crates_project_src_agent__server__store.rs
index 2092c8e707a7..70e513052587 100644
--- a/editors/zed/files/patch-crates_project_src_agent__server__store.rs
+++ b/editors/zed/files/patch-crates_project_src_agent__server__store.rs
@@ -1,6 +1,6 @@
---- crates/project/src/agent_server_store.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/project/src/agent_server_store.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/project/src/agent_server_store.rs
-@@ -1494,6 +1494,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat
+@@ -1519,6 +1519,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat
"pc-windows-msvc"
} else if cfg!(target_os = "linux") {
"unknown-linux-gnu"
@@ -9,7 +9,7 @@
} else {
return None;
};
-@@ -1580,6 +1582,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
+@@ -1605,6 +1607,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
"linux"
} else if cfg!(target_os = "windows") {
"windows"
diff --git a/editors/zed/files/patch-crates_remote__server_src_unix.rs b/editors/zed/files/patch-crates_remote__server_src_unix.rs
index 7cf7b1a8115d..45bb9ed0564b 100644
--- a/editors/zed/files/patch-crates_remote__server_src_unix.rs
+++ b/editors/zed/files/patch-crates_remote__server_src_unix.rs
@@ -1,6 +1,6 @@
---- crates/remote_server/src/unix.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/remote_server/src/unix.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/remote_server/src/unix.rs
-@@ -355,6 +355,7 @@ pub fn execute_run(
+@@ -356,6 +356,7 @@ pub fn execute_run(
let app = gpui::Application::headless();
let id = std::process::id().to_string();
@@ -8,7 +8,7 @@
app.background_executor()
.spawn(crashes::init(crashes::InitCrashHandler {
session_id: id,
-@@ -573,6 +574,7 @@ pub(crate) fn execute_proxy(
+@@ -581,6 +582,7 @@ pub(crate) fn execute_proxy(
let server_paths = ServerPaths::new(&identifier)?;
let id = std::process::id().to_string();
diff --git a/editors/zed/files/patch-crates_remote_src_transport_ssh.rs b/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
index ba344951a7a5..21fadf3fcc98 100644
--- a/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
+++ b/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
@@ -1,21 +1,21 @@
---- crates/remote/src/transport/ssh.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/remote/src/transport/ssh.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/remote/src/transport/ssh.rs
-@@ -1059,6 +1059,7 @@ impl SshSocket {
- let os = match os.trim() {
- "Darwin" => "macos",
- "Linux" => "linux",
-+ "FreeBSD" => "freebsd",
- _ => anyhow::bail!(
- "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
- ),
-@@ -1070,7 +1071,9 @@ impl SshSocket {
- || arch.starts_with("aarch64")
- {
- "aarch64"
-- } else if arch.starts_with("x86") {
-+ } else if arch.starts_with("x86")
-+ || arch.starts_with("amd64")
-+ {
- "x86_64"
- } else {
- anyhow::bail!(
+@@ -1087,6 +1087,7 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
+ let os = match os {
+ "Darwin" => "macos",
+ "Linux" => "linux",
++ "FreeBSD" => "freebsd",
+ _ => anyhow::bail!(
+ "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
+ ),
+@@ -1099,7 +1100,9 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
+ || arch.starts_with("aarch64")
+ {
+ "aarch64"
+- } else if arch.starts_with("x86") {
++ } else if arch.starts_with("x86")
++ || arch.starts_with("amd64")
++ {
+ "x86_64"
+ } else {
+ anyhow::bail!(
diff --git a/editors/zed/files/patch-crates_zed_src_main.rs b/editors/zed/files/patch-crates_zed_src_main.rs
index 779136d84aa1..6f71c25603a2 100644
--- a/editors/zed/files/patch-crates_zed_src_main.rs
+++ b/editors/zed/files/patch-crates_zed_src_main.rs
@@ -1,4 +1,4 @@
---- crates/zed/src/main.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/zed/src/main.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/zed/src/main.rs
@@ -8,6 +8,7 @@ use collections::HashMap;
use client::{Client, ProxySettings, UserStore, parse_zed_link};
@@ -16,15 +16,15 @@
if let Some(socket) = &args.crash_handler {
crashes::crash_server(socket.as_path());
return;
-@@ -292,6 +294,7 @@ pub fn main() {
- let session_id = Uuid::new_v4().to_string();
- let session = app.background_executor().block(Session::new());
+@@ -294,6 +296,7 @@ pub fn main() {
+ .background_executor()
+ .spawn(Session::new(session_id.clone()));
+ #[cfg(not(target_os = "freebsd"))]
app.background_executor()
.spawn(crashes::init(InitCrashHandler {
- session_id: session_id.clone(),
-@@ -545,6 +548,7 @@ pub fn main() {
+ session_id,
+@@ -552,6 +555,7 @@ pub fn main() {
auto_update::init(client.clone(), cx);
dap_adapters::init(cx);
auto_update_ui::init(cx);
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 20:53:42 +0000