diff --git a/Cargo.lock b/Cargo.lock index 7bd1471cbe..ce5ea35821 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -631,6 +631,7 @@ dependencies = [ "async-global-executor", "async-io 1.13.0", "async-lock 2.8.0", + "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -2249,6 +2250,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-compression", + "async-std", "async-tar", "clock", "collections", @@ -5850,15 +5852,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -6858,11 +6851,11 @@ dependencies = [ [[package]] name = "procinfo" version = "0.1.0" -source = "git+https://github.com/zed-industries/wezterm?rev=5cd757e5f2eb039ed0c6bb6512223e69d5efc64d#5cd757e5f2eb039ed0c6bb6512223e69d5efc64d" +source = "git+https://github.com/zed-industries/wezterm?rev=0c13436f4fa8b126f46dd4a20106419b41666897#0c13436f4fa8b126f46dd4a20106419b41666897" dependencies = [ "libc", "log", - "ntapi 0.3.7", + "ntapi", "winapi 0.3.9", ] @@ -9340,7 +9333,7 @@ dependencies = [ "cfg-if 1.0.0", "core-foundation-sys 0.8.6", "libc", - "ntapi 0.4.1", + "ntapi", "once_cell", "rayon", "winapi 0.3.9", @@ -10195,7 +10188,7 @@ dependencies = [ [[package]] name = "tree-sitter-gitcommit" version = "0.3.3" -source = "git+https://github.com/gbprod/tree-sitter-gitcommit#e8d9eda4e5ea0b08aa39d48dab0f6553058fbe0f" +source = "git+https://github.com/gbprod/tree-sitter-gitcommit#7c01af8d227b5344f62aade2ff00f19bd0c458ca" dependencies = [ "cc", "tree-sitter", @@ -10249,7 +10242,7 @@ dependencies = [ [[package]] name = "tree-sitter-haskell" version = "0.14.0" -source = "git+https://github.com/tree-sitter/tree-sitter-haskell?rev=cf98de23e4285b8e6bcb57b050ef2326e2cc284b#cf98de23e4285b8e6bcb57b050ef2326e2cc284b" +source = "git+https://github.com/tree-sitter/tree-sitter-haskell?rev=8a99848fc734f9c4ea523b3f2a07df133cbbcec2#8a99848fc734f9c4ea523b3f2a07df133cbbcec2" dependencies = [ "cc", "tree-sitter", @@ -10436,7 +10429,7 @@ dependencies = [ [[package]] name = "tree-sitter-svelte" version = "0.10.2" -source = "git+https://github.com/Himujjal/tree-sitter-svelte?rev=697bb515471871e85ff799ea57a76298a71a9cca#697bb515471871e85ff799ea57a76298a71a9cca" +source = "git+https://github.com/Himujjal/tree-sitter-svelte?rev=bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd#bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd" dependencies = [ "cc", "tree-sitter", @@ -10462,8 +10455,8 @@ dependencies = [ [[package]] name = "tree-sitter-uiua" -version = "0.3.3" -source = "git+https://github.com/shnarazk/tree-sitter-uiua?rev=9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2#9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2" +version = "0.10.0" +source = "git+https://github.com/shnarazk/tree-sitter-uiua?rev=21dc2db39494585bf29a3f86d5add6e9d11a22ba#21dc2db39494585bf29a3f86d5add6e9d11a22ba" dependencies = [ "cc", "tree-sitter", diff --git a/Cargo.toml b/Cargo.toml index b0fab89002..77f91e3e0c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -247,7 +247,7 @@ tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" } tree-sitter-gomod = { git = "https://github.com/camdencheek/tree-sitter-go-mod" } tree-sitter-gowork = { git = "https://github.com/d1y/tree-sitter-go-work" } -tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" } +tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "8a99848fc734f9c4ea523b3f2a07df133cbbcec2" } tree-sitter-hcl = { git = "https://github.com/MichaHoffmann/tree-sitter-hcl", rev = "v1.1.0" } tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" } tree-sitter-html = "0.19.0" @@ -266,10 +266,10 @@ tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-rack tree-sitter-ruby = "0.20.0" tree-sitter-rust = "0.20.3" tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" } -tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca" } +tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd" } tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" } tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" } -tree-sitter-uiua = { git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2" } +tree-sitter-uiua = { git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "21dc2db39494585bf29a3f86d5add6e9d11a22ba" } tree-sitter-vue = { git = "https://github.com/zed-industries/tree-sitter-vue", rev = "6608d9d60c386f19d80af7d8132322fa11199c42" } tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930" } tree-sitter-zig = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4c3f426ec61695d7617415fff97029bd" } diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml index 8ad50e898a..b15eee72c2 100644 --- a/crates/copilot/Cargo.toml +++ b/crates/copilot/Cargo.toml @@ -38,6 +38,9 @@ smol.workspace = true theme.workspace = true util.workspace = true +[target.'cfg(windows)'.dependencies] +async-std = { version = "1.12.0", features = ["unstable"] } + [dev-dependencies] clock.workspace = true collections = { workspace = true, features = ["test-support"] } diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml index 4dc535d846..c93a987522 100644 --- a/crates/terminal/Cargo.toml +++ b/crates/terminal/Cargo.toml @@ -23,7 +23,7 @@ lazy_static.workspace = true libc = "0.2" mio-extras = "2.0.6" ordered-float.workspace = true -procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false } +procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "0c13436f4fa8b126f46dd4a20106419b41666897", default-features = false } runnable.workspace = true schemars.workspace = true serde.workspace = true diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml index 64972a78e8..d254893b41 100644 --- a/crates/terminal_view/Cargo.toml +++ b/crates/terminal_view/Cargo.toml @@ -23,7 +23,7 @@ lazy_static.workspace = true libc = "0.2" mio-extras = "2.0.6" ordered-float.workspace = true -procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false } +procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "0c13436f4fa8b126f46dd4a20106419b41666897", default-features = false } project.workspace = true runnable.workspace = true search.workspace = true diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index a79ed09782..d36e6d36e6 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -143,7 +143,6 @@ tree-sitter-ocaml.workspace = true tree-sitter-php.workspace = true tree-sitter-prisma-io.workspace = true tree-sitter-proto.workspace = true -tree-sitter-purescript.workspace = true tree-sitter-python.workspace = true tree-sitter-racket.workspace = true tree-sitter-ruby.workspace = true @@ -166,6 +165,9 @@ welcome.workspace = true workspace.workspace = true zed_actions.workspace = true +[target.'cfg(not(windows))'.dependencies] +tree-sitter-purescript.workspace = true + [dev-dependencies] call = { workspace = true, features = ["test-support"] } editor = { workspace = true, features = ["test-support"] } diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs index 7ae8ca7c40..34fd7642bc 100644 --- a/crates/zed/src/languages.rs +++ b/crates/zed/src/languages.rs @@ -106,7 +106,7 @@ pub fn init( ("php", tree_sitter_php::language_php()), ("prisma", tree_sitter_prisma_io::language()), ("proto", tree_sitter_proto::language()), - #[cfg(not(target_os = "linux"))] + #[cfg(not(any(target_os = "linux", target_os = "windows")))] ("purescript", tree_sitter_purescript::language()), ("python", tree_sitter_python::language()), ("racket", tree_sitter_racket::language()),