editors/zed: Update to 0.218.6

Changelog:
- https://github.com/zed-industries/zed/releases/tag/v0.218.5
- https://github.com/zed-industries/zed/releases/tag/v0.218.6

Reported by:	GitHub (watch releases)

14 files changed, 70 insertions, 50 deletions

diff --git a/editors/zed/Makefile b/editors/zed/Makefile
index 373a5122de20..f56a4dddd509 100644
--- a/editors/zed/Makefile
+++ b/editors/zed/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zed
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.217.4
+DISTVERSION=	0.218.6
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-editor
 
diff --git a/editors/zed/Makefile.crates b/editors/zed/Makefile.crates
index 881cf54fdba2..f3800ec39bb7 100644
--- a/editors/zed/Makefile.crates
+++ b/editors/zed/Makefile.crates
@@ -162,7 +162,7 @@ CARGO_CRATES=	addr2line-0.25.1 \
 		cast-0.3.0 \
 		cbc-0.1.2 \
 		cbindgen-0.28.0 \
-		cc-1.2.41 \
+		cc-1.2.49 \
 		cesu8-1.1.0 \
 		cexpr-0.6.0 \
 		cfg-expr-0.15.8 \
@@ -183,7 +183,7 @@ CARGO_CRATES=	addr2line-0.25.1 \
 		clap_complete-4.5.59 \
 		clap_derive-4.5.49 \
 		clap_lex-0.7.6 \
-		cmake-0.1.54 \
+		cmake-0.1.56 \
 		cobs-0.3.0 \
 		cocoa-0.25.0 \
 		cocoa-0.26.0 \
@@ -363,7 +363,7 @@ CARGO_CRATES=	addr2line-0.25.1 \
 		ff-0.12.1 \
 		filedescriptor-0.8.3 \
 		filetime-0.2.26 \
-		find-msvc-tools-0.1.4 \
+		find-msvc-tools-0.1.5 \
 		fixedbitset-0.4.2 \
 		flate2-1.1.4 \
 		float-cmp-0.9.0 \
diff --git a/editors/zed/distinfo b/editors/zed/distinfo
index dc2ba7a3d535..aa8a56ce252c 100644
--- a/editors/zed/distinfo
+++ b/editors/zed/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1767776541
+TIMESTAMP = 1768024263
 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
@@ -327,8 +327,8 @@ SHA256 (rust/crates/cbc-0.1.2.crate) = 26b52a9543ae338f279b96b0b9fed9c8093744685
 SIZE (rust/crates/cbc-0.1.2.crate) = 23501
 SHA256 (rust/crates/cbindgen-0.28.0.crate) = eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff
 SIZE (rust/crates/cbindgen-0.28.0.crate) = 223401
-SHA256 (rust/crates/cc-1.2.41.crate) = ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7
-SIZE (rust/crates/cc-1.2.41.crate) = 91154
+SHA256 (rust/crates/cc-1.2.49.crate) = 90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215
+SIZE (rust/crates/cc-1.2.49.crate) = 93145
 SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
 SIZE (rust/crates/cesu8-1.1.0.crate) = 10555
 SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
@@ -369,8 +369,8 @@ SHA256 (rust/crates/clap_derive-4.5.49.crate) = 2a0b5487afeab2deb2ff4e03a807ad1a
 SIZE (rust/crates/clap_derive-4.5.49.crate) = 33559
 SHA256 (rust/crates/clap_lex-0.7.6.crate) = a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d
 SIZE (rust/crates/clap_lex-0.7.6.crate) = 13466
-SHA256 (rust/crates/cmake-0.1.54.crate) = e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0
-SIZE (rust/crates/cmake-0.1.54.crate) = 18955
+SHA256 (rust/crates/cmake-0.1.56.crate) = b042e5d8a74ae91bb0961acd039822472ec99f8ab0948cbf6d1369588f8be586
+SIZE (rust/crates/cmake-0.1.56.crate) = 20125
 SHA256 (rust/crates/cobs-0.3.0.crate) = 0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1
 SIZE (rust/crates/cobs-0.3.0.crate) = 15639
 SHA256 (rust/crates/cocoa-0.25.0.crate) = f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c
@@ -729,8 +729,8 @@ SHA256 (rust/crates/filedescriptor-0.8.3.crate) = e40758ed24c9b2eeb76c35fb0aebc6
 SIZE (rust/crates/filedescriptor-0.8.3.crate) = 12635
 SHA256 (rust/crates/filetime-0.2.26.crate) = bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed
 SIZE (rust/crates/filetime-0.2.26.crate) = 17273
-SHA256 (rust/crates/find-msvc-tools-0.1.4.crate) = 52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127
-SIZE (rust/crates/find-msvc-tools-0.1.4.crate) = 30817
+SHA256 (rust/crates/find-msvc-tools-0.1.5.crate) = 3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844
+SIZE (rust/crates/find-msvc-tools-0.1.5.crate) = 30942
 SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
 SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
 SHA256 (rust/crates/flate2-1.1.4.crate) = dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9
@@ -2809,5 +2809,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.217.4_GH0.tar.gz) = 97cdbbb2f023acba5a5c2f779c8a81f0d666db735c7929a4db2ac900c9c1ace4
-SIZE (zed-industries-zed-v0.217.4_GH0.tar.gz) = 22346889
+SHA256 (zed-industries-zed-v0.218.6_GH0.tar.gz) = 4192fc27529937f5fb7f3a8a95f021f04acdeadd4d205b0239fc90fc008c325a
+SIZE (zed-industries-zed-v0.218.6_GH0.tar.gz) = 22450669
diff --git a/editors/zed/files/patch-Cargo.lock b/editors/zed/files/patch-Cargo.lock
index 517779c42569..598250f4562c 100644
--- a/editors/zed/files/patch-Cargo.lock
+++ b/editors/zed/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig	2025-12-19 13:27:12 UTC
+--- Cargo.lock.orig	2026-01-08 00:39:18 UTC
 +++ Cargo.lock
-@@ -8323,21 +8323,20 @@ name = "ipc-channel"
+@@ -8347,21 +8347,20 @@ name = "ipc-channel"
  
  [[package]]
  name = "ipc-channel"
@@ -26,7 +26,7 @@
  ]
  
  [[package]]
-@@ -19129,16 +19128,6 @@ name = "windows"
+@@ -19164,16 +19163,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"
-@@ -19197,19 +19186,6 @@ name = "windows-core"
+@@ -19232,19 +19221,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"
-@@ -19258,17 +19234,6 @@ name = "windows-implement"
+@@ -19293,17 +19269,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"
-@@ -19291,17 +19256,6 @@ name = "windows-interface"
+@@ -19326,17 +19291,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"
-@@ -19377,15 +19331,6 @@ name = "windows-result"
+@@ -19412,15 +19366,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"
-@@ -19400,16 +19345,6 @@ dependencies = [
+@@ -19435,16 +19380,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 1a8d5b39261b..a1e1c3ca2baf 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-11 21:24:05 UTC
+--- crates/fs/src/fs.rs.orig	2026-01-08 00:39:18 UTC
 +++ crates/fs/src/fs.rs
-@@ -360,7 +360,7 @@ impl FileHandle for std::fs::File {
+@@ -359,7 +359,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},
-@@ -369,7 +369,10 @@ impl FileHandle for std::fs::File {
+@@ -368,7 +368,10 @@ impl FileHandle for std::fs::File {
  
          let fd = self.as_fd();
          let mut kif = MaybeUninit::<libc::kinfo_file>::uninit();
@@ -20,9 +20,9 @@
 +        }
  
          let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, kif.as_mut_ptr()) };
-         if result == -1 {
-@@ -380,6 +383,11 @@ impl FileHandle for std::fs::File {
-         let c_str = unsafe { CStr::from_ptr(kif.assume_init().kf_path.as_ptr()) };
+         anyhow::ensure!(result != -1, "fcntl returned -1");
+@@ -378,6 +381,11 @@ impl FileHandle for std::fs::File {
+         anyhow::ensure!(!c_str.is_empty(), "Could find a path for the file handle");
          let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
          Ok(path)
 +    }
diff --git a/editors/zed/files/patch-crates_gpui_src_gpui.rs b/editors/zed/files/patch-crates_gpui_src_gpui.rs
new file mode 100644
index 000000000000..194d0a9a187c
--- /dev/null
+++ b/editors/zed/files/patch-crates_gpui_src_gpui.rs
@@ -0,0 +1,20 @@
+--- crates/gpui/src/gpui.rs.orig	2026-01-10 05:46:21 UTC
++++ crates/gpui/src/gpui.rs
+@@ -31,7 +31,7 @@ mod profiler;
+ mod platform;
+ pub mod prelude;
+ mod profiler;
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ mod queue;
+ mod scene;
+ mod shared_string;
+@@ -91,7 +91,7 @@ pub use profiler::*;
+ pub use path_builder::*;
+ pub use platform::*;
+ pub use profiler::*;
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ pub(crate) use queue::{PriorityQueueReceiver, PriorityQueueSender};
+ pub use refineable::*;
+ pub use scene::*;
diff --git a/editors/zed/files/patch-crates_gpui_src_platform.rs b/editors/zed/files/patch-crates_gpui_src_platform.rs
index 068b8f699b40..446544221b1a 100644
--- a/editors/zed/files/patch-crates_gpui_src_platform.rs
+++ b/editors/zed/files/patch-crates_gpui_src_platform.rs
@@ -1,6 +1,6 @@
---- crates/gpui/src/platform.rs.orig	2025-12-03 16:43:47 UTC
+--- crates/gpui/src/platform.rs.orig	2026-01-08 00:39:18 UTC
 +++ crates/gpui/src/platform.rs
-@@ -81,7 +81,7 @@ pub(crate) use windows::*;
+@@ -82,7 +82,7 @@ pub(crate) use windows::*;
  #[cfg(target_os = "windows")]
  pub(crate) use windows::*;
  
@@ -9,7 +9,7 @@
  pub use linux::layer_shell;
  
  #[cfg(any(test, feature = "test-support"))]
-@@ -1337,7 +1337,7 @@ pub enum WindowKind {
+@@ -1346,7 +1346,7 @@ pub enum WindowKind {
  
      /// A Wayland LayerShell window, used to draw overlays or backgrounds for applications such as
      /// docks, notifications or wallpapers.
diff --git a/editors/zed/files/patch-crates_remote__server_Cargo.toml b/editors/zed/files/patch-crates_remote__server_Cargo.toml
index e57aa8882fe8..36d9d3b1b9af 100644
--- a/editors/zed/files/patch-crates_remote__server_Cargo.toml
+++ b/editors/zed/files/patch-crates_remote__server_Cargo.toml
@@ -1,6 +1,6 @@
---- crates/remote_server/Cargo.toml.orig	2025-12-03 16:43:47 UTC
+--- crates/remote_server/Cargo.toml.orig	2026-01-08 00:39:18 UTC
 +++ crates/remote_server/Cargo.toml
-@@ -69,12 +69,16 @@ rayon.workspace = true
+@@ -70,12 +70,16 @@ rayon.workspace = true
  thiserror.workspace = true
  rayon.workspace = true
  
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 45bb9ed0564b..96b985578e9f 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-11 21:24:05 UTC
+--- crates/remote_server/src/unix.rs.orig	2026-01-08 00:39:18 UTC
 +++ crates/remote_server/src/unix.rs
-@@ -356,6 +356,7 @@ pub fn execute_run(
+@@ -358,6 +358,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,
-@@ -581,6 +582,7 @@ pub(crate) fn execute_proxy(
+@@ -585,6 +586,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.rs b/editors/zed/files/patch-crates_remote_src_transport.rs
index cc548bd5396d..d565a9a78dc8 100644
--- a/editors/zed/files/patch-crates_remote_src_transport.rs
+++ b/editors/zed/files/patch-crates_remote_src_transport.rs
@@ -1,6 +1,6 @@
---- crates/remote/src/transport.rs.orig	2025-12-19 13:24:55 UTC
+--- crates/remote/src/transport.rs.orig	2026-01-08 00:39:18 UTC
 +++ crates/remote/src/transport.rs
-@@ -27,6 +27,7 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
+@@ -28,6 +28,7 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
      let os = match os {
          "Darwin" => "macos",
          "Linux" => "linux",
@@ -8,7 +8,7 @@
          _ => anyhow::bail!(
              "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
          ),
-@@ -39,7 +40,9 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
+@@ -40,7 +41,9 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
          || arch.starts_with("aarch64")
      {
          "aarch64"
diff --git a/editors/zed/files/patch-crates_zed_Cargo.toml b/editors/zed/files/patch-crates_zed_Cargo.toml
index ba3632755404..3f1ee6776095 100644
--- a/editors/zed/files/patch-crates_zed_Cargo.toml
+++ b/editors/zed/files/patch-crates_zed_Cargo.toml
@@ -1,6 +1,6 @@
---- crates/zed/Cargo.toml.orig	2025-12-18 17:41:26 UTC
+--- crates/zed/Cargo.toml.orig	2026-01-08 00:39:18 UTC
 +++ crates/zed/Cargo.toml
-@@ -45,7 +45,6 @@ copilot.workspace = true
+@@ -46,7 +46,6 @@ copilot.workspace = true
  command_palette.workspace = true
  component.workspace = true
  copilot.workspace = true
@@ -8,7 +8,7 @@
  dap_adapters.workspace = true
  db.workspace = true
  debug_adapter_extension.workspace = true
-@@ -178,6 +177,9 @@ ashpd.workspace = true
+@@ -179,6 +178,9 @@ ashpd.workspace = true
  
  [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
  ashpd.workspace = true
diff --git a/editors/zed/files/patch-crates_zed_src_main.rs b/editors/zed/files/patch-crates_zed_src_main.rs
index fcf04fd58ac9..def966526693 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-18 17:41:26 UTC
+--- crates/zed/src/main.rs.orig	2026-01-08 00:39:18 UTC
 +++ crates/zed/src/main.rs
 @@ -8,6 +8,7 @@ use collections::HashMap;
  use client::{Client, ProxySettings, UserStore, parse_zed_link};
@@ -8,7 +8,7 @@
  use crashes::InitCrashHandler;
  use db::kvp::{GLOBAL_KEY_VALUE_STORE, KEY_VALUE_STORE};
  use editor::Editor;
-@@ -183,6 +184,7 @@ pub fn main() {
+@@ -181,6 +182,7 @@ pub fn main() {
      }
  
      // `zed --crash-handler` Makes zed operate in minidump crash handler mode
@@ -24,7 +24,7 @@
      app.background_executor()
          .spawn(crashes::init(InitCrashHandler {
              session_id,
-@@ -554,6 +557,7 @@ pub fn main() {
+@@ -563,6 +566,7 @@ pub fn main() {
          auto_update::init(client.clone(), cx);
          dap_adapters::init(cx);
          auto_update_ui::init(cx);
diff --git a/editors/zed/files/patch-crates_zed_src_reliability.rs b/editors/zed/files/patch-crates_zed_src_reliability.rs
index ec49ac8a0fa8..084a9469f903 100644
--- a/editors/zed/files/patch-crates_zed_src_reliability.rs
+++ b/editors/zed/files/patch-crates_zed_src_reliability.rs
@@ -1,6 +1,6 @@
---- crates/zed/src/reliability.rs.orig	2025-11-27 19:12:04 UTC
+--- crates/zed/src/reliability.rs.orig	2026-01-08 00:39:18 UTC
 +++ crates/zed/src/reliability.rs
-@@ -13,6 +13,7 @@ use crate::STARTUP_TIME;
+@@ -16,6 +16,7 @@ use crate::STARTUP_TIME;
  
  use crate::STARTUP_TIME;
  
@@ -8,7 +8,7 @@
  pub fn init(client: Arc<Client>, cx: &mut App) {
      monitor_hangs(cx);
  
-@@ -151,6 +152,7 @@ fn save_hang_trace(
+@@ -154,6 +155,7 @@ fn save_hang_trace(
      );
  }
  
@@ -16,7 +16,7 @@
  pub async fn upload_previous_minidumps(client: Arc<Client>) -> anyhow::Result<()> {
      let Some(minidump_endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
          log::warn!("Minidump endpoint not set");
-@@ -186,6 +188,7 @@ pub async fn upload_previous_minidumps(client: Arc<Cli
+@@ -195,6 +197,7 @@ pub async fn upload_previous_minidumps(client: Arc<Cli
      Ok(())
  }
  
diff --git a/editors/zed/files/patch-crates_zed_src_zed.rs b/editors/zed/files/patch-crates_zed_src_zed.rs
index 8daaa39bec14..2b2a3dc5eac0 100644
--- a/editors/zed/files/patch-crates_zed_src_zed.rs
+++ b/editors/zed/files/patch-crates_zed_src_zed.rs
@@ -1,6 +1,6 @@
---- crates/zed/src/zed.rs.orig	2025-12-03 16:43:47 UTC
+--- crates/zed/src/zed.rs.orig	2026-01-08 00:39:18 UTC
 +++ crates/zed/src/zed.rs
-@@ -385,6 +385,7 @@ pub fn initialize_workspace(
+@@ -387,6 +387,7 @@ pub fn initialize_workspace(
          if let Some(specs) = window.gpu_specs() {
              log::info!("Using GPU: {:?}", specs);
              show_software_emulation_warning_if_needed(specs.clone(), window, cx);