Merge pull request #312030 from GaetanLepage/zed

zed-editor: 0.134.4 -> 0.135.2
This commit is contained in:
Pol Dellaiera
2024-05-16 10:50:47 +02:00
committed by GitHub
2 changed files with 161 additions and 56 deletions
+158 -53
View File
@@ -384,6 +384,7 @@ dependencies = [
"feature_flags",
"fs",
"futures 0.3.28",
"fuzzy",
"gpui",
"language",
"languages",
@@ -391,6 +392,7 @@ dependencies = [
"nanoid",
"node_runtime",
"open_ai",
"picker",
"project",
"rand 0.8.5",
"release_channel",
@@ -412,10 +414,17 @@ name = "assistant_tooling"
version = "0.1.0"
dependencies = [
"anyhow",
"collections",
"futures 0.3.28",
"gpui",
"project",
"schemars",
"serde",
"serde_json",
"settings",
"sum_tree",
"unindent",
"util",
]
[[package]]
@@ -1481,7 +1490,7 @@ dependencies = [
[[package]]
name = "blade-graphics"
version = "0.4.0"
source = "git+https://github.com/kvark/blade?rev=e82eec97691c3acdb43494484be60d661edfebf3#e82eec97691c3acdb43494484be60d661edfebf3"
source = "git+https://github.com/kvark/blade?rev=f5766863de9dcc092e90fdbbc5e0007a99e7f9bf#f5766863de9dcc092e90fdbbc5e0007a99e7f9bf"
dependencies = [
"ash",
"ash-window",
@@ -1511,7 +1520,7 @@ dependencies = [
[[package]]
name = "blade-macros"
version = "0.2.1"
source = "git+https://github.com/kvark/blade?rev=e82eec97691c3acdb43494484be60d661edfebf3#e82eec97691c3acdb43494484be60d661edfebf3"
source = "git+https://github.com/kvark/blade?rev=f5766863de9dcc092e90fdbbc5e0007a99e7f9bf#f5766863de9dcc092e90fdbbc5e0007a99e7f9bf"
dependencies = [
"proc-macro2",
"quote",
@@ -2272,6 +2281,7 @@ dependencies = [
"collections",
"ctor",
"dashmap",
"dev_server_projects",
"editor",
"env_logger",
"envy",
@@ -2279,6 +2289,7 @@ dependencies = [
"fs",
"futures 0.3.28",
"git",
"git_hosting_providers",
"google_ai",
"gpui",
"headless",
@@ -2301,7 +2312,6 @@ dependencies = [
"prost",
"rand 0.8.5",
"release_channel",
"remote_projects",
"reqwest",
"rpc",
"rustc-demangle",
@@ -2316,6 +2326,7 @@ dependencies = [
"sha2 0.10.7",
"sqlx",
"subtle",
"supermaven_api",
"telemetry_events",
"text",
"theme",
@@ -2344,6 +2355,7 @@ dependencies = [
"clock",
"collections",
"db",
"dev_server_projects",
"editor",
"emojis",
"extensions_ui",
@@ -2359,6 +2371,7 @@ dependencies = [
"pretty_assertions",
"project",
"recent_projects",
"release_channel",
"rich_text",
"rpc",
"schemars",
@@ -2510,30 +2523,10 @@ dependencies = [
"async-compression",
"async-std",
"async-tar",
"client",
"clock",
"collections",
"command_palette_hooks",
"fs",
"futures 0.3.28",
"gpui",
"language",
"lsp",
"node_runtime",
"parking_lot",
"rpc",
"serde",
"settings",
"smol",
"util",
]
[[package]]
name = "copilot_ui"
version = "0.1.0"
dependencies = [
"anyhow",
"client",
"copilot",
"editor",
"fs",
"futures 0.3.28",
@@ -2542,14 +2535,18 @@ dependencies = [
"language",
"lsp",
"menu",
"node_runtime",
"parking_lot",
"project",
"rpc",
"serde",
"serde_json",
"settings",
"smol",
"theme",
"ui",
"util",
"workspace",
"zed_actions",
]
[[package]]
@@ -3176,6 +3173,18 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "dev_server_projects"
version = "0.1.0"
dependencies = [
"anyhow",
"client",
"gpui",
"rpc",
"serde",
"serde_json",
]
[[package]]
name = "diagnostics"
version = "0.1.0"
@@ -3396,6 +3405,7 @@ dependencies = [
"smol",
"snippet",
"sum_tree",
"task",
"text",
"theme",
"time",
@@ -4385,14 +4395,16 @@ name = "git"
version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
"clock",
"collections",
"derive_more",
"git2",
"gpui",
"lazy_static",
"log",
"parking_lot",
"pretty_assertions",
"regex",
"rope",
"serde",
"serde_json",
@@ -4419,6 +4431,25 @@ dependencies = [
"url",
]
[[package]]
name = "git_hosting_providers"
version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
"futures 0.3.28",
"git",
"gpui",
"isahc",
"pretty_assertions",
"regex",
"serde",
"serde_json",
"unindent",
"url",
"util",
]
[[package]]
name = "glob"
version = "0.3.1"
@@ -4467,6 +4498,7 @@ name = "go_to_line"
version = "0.1.0"
dependencies = [
"anyhow",
"collections",
"editor",
"gpui",
"indoc",
@@ -4604,6 +4636,7 @@ dependencies = [
"wayland-client",
"wayland-cursor",
"wayland-protocols",
"wayland-protocols-plasma",
"windows 0.53.0",
"x11rb",
"xkbcommon",
@@ -5128,6 +5161,30 @@ dependencies = [
"syn 2.0.59",
]
[[package]]
name = "inline_completion_button"
version = "0.1.0"
dependencies = [
"anyhow",
"copilot",
"editor",
"fs",
"futures 0.3.28",
"gpui",
"indoc",
"language",
"lsp",
"project",
"serde_json",
"settings",
"supermaven",
"theme",
"ui",
"util",
"workspace",
"zed_actions",
]
[[package]]
name = "inotify"
version = "0.9.6"
@@ -5533,6 +5590,7 @@ dependencies = [
"anyhow",
"client",
"collections",
"copilot",
"editor",
"env_logger",
"futures 0.3.28",
@@ -5676,9 +5734,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libmimalloc-sys"
version = "0.1.35"
version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7"
dependencies = [
"cc",
"libc",
@@ -6043,9 +6101,9 @@ dependencies = [
[[package]]
name = "mimalloc"
version = "0.1.39"
version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d"
dependencies = [
"libmimalloc-sys",
]
@@ -6787,6 +6845,7 @@ dependencies = [
name = "outline"
version = "0.1.0"
dependencies = [
"collections",
"editor",
"fuzzy",
"gpui",
@@ -7406,7 +7465,6 @@ dependencies = [
"client",
"clock",
"collections",
"copilot",
"env_logger",
"fs",
"futures 0.3.28",
@@ -7790,6 +7848,7 @@ name = "recent_projects"
version = "0.1.0"
dependencies = [
"anyhow",
"dev_server_projects",
"editor",
"feature_flags",
"fuzzy",
@@ -7799,7 +7858,6 @@ dependencies = [
"ordered-float 2.10.0",
"picker",
"project",
"remote_projects",
"rpc",
"serde",
"serde_json",
@@ -7934,18 +7992,6 @@ dependencies = [
"once_cell",
]
[[package]]
name = "remote_projects"
version = "0.1.0"
dependencies = [
"anyhow",
"client",
"gpui",
"rpc",
"serde",
"serde_json",
]
[[package]]
name = "rend"
version = "0.4.0"
@@ -8701,7 +8747,12 @@ dependencies = [
"sha2 0.10.7",
"smol",
"tempfile",
"theme",
"tree-sitter",
"ui",
"unindent",
"util",
"workspace",
"worktree",
]
@@ -9588,6 +9639,43 @@ dependencies = [
"rayon",
]
[[package]]
name = "supermaven"
version = "0.1.0"
dependencies = [
"anyhow",
"client",
"collections",
"editor",
"env_logger",
"futures 0.3.28",
"gpui",
"language",
"log",
"postage",
"project",
"serde",
"serde_json",
"settings",
"smol",
"supermaven_api",
"theme",
"ui",
"util",
]
[[package]]
name = "supermaven_api"
version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.28",
"serde",
"serde_json",
"smol",
"util",
]
[[package]]
name = "sval"
version = "2.8.0"
@@ -9821,6 +9909,7 @@ dependencies = [
"futures 0.3.28",
"gpui",
"hex",
"parking_lot",
"schemars",
"serde",
"serde_json_lenient",
@@ -9833,7 +9922,6 @@ dependencies = [
name = "tasks_ui"
version = "0.1.0"
dependencies = [
"anyhow",
"editor",
"file_icons",
"fuzzy",
@@ -11725,6 +11813,19 @@ dependencies = [
"wayland-scanner",
]
[[package]]
name = "wayland-protocols-plasma"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
dependencies = [
"bitflags 2.4.2",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-scanner",
]
[[package]]
name = "wayland-protocols-wlr"
version = "0.2.0"
@@ -11792,11 +11893,12 @@ version = "0.1.0"
dependencies = [
"anyhow",
"client",
"copilot_ui",
"db",
"editor",
"extensions_ui",
"fuzzy",
"gpui",
"inline_completion_button",
"install_cli",
"picker",
"project",
@@ -12403,6 +12505,7 @@ dependencies = [
"collections",
"db",
"derive_more",
"dev_server_projects",
"env_logger",
"fs",
"futures 0.3.28",
@@ -12415,7 +12518,6 @@ dependencies = [
"parking_lot",
"postage",
"project",
"remote_projects",
"schemars",
"serde",
"serde_json",
@@ -12654,7 +12756,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.134.4"
version = "0.135.2"
dependencies = [
"activity_indicator",
"anyhow",
@@ -12676,8 +12778,8 @@ dependencies = [
"collections",
"command_palette",
"copilot",
"copilot_ui",
"db",
"dev_server_projects",
"diagnostics",
"editor",
"env_logger",
@@ -12688,10 +12790,13 @@ dependencies = [
"file_icons",
"fs",
"futures 0.3.28",
"git",
"git_hosting_providers",
"go_to_line",
"gpui",
"headless",
"image_viewer",
"inline_completion_button",
"install_cli",
"isahc",
"journal",
@@ -12715,7 +12820,6 @@ dependencies = [
"quick_action_bar",
"recent_projects",
"release_channel",
"remote_projects",
"rope",
"search",
"serde",
@@ -12723,6 +12827,7 @@ dependencies = [
"settings",
"simplelog",
"smol",
"supermaven",
"tab_switcher",
"task",
"tasks_ui",
@@ -12786,7 +12891,7 @@ dependencies = [
[[package]]
name = "zed_elixir"
version = "0.0.1"
version = "0.0.4"
dependencies = [
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -12920,7 +13025,7 @@ dependencies = [
[[package]]
name = "zed_toml"
version = "0.1.0"
version = "0.1.1"
dependencies = [
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -12941,7 +13046,7 @@ dependencies = [
[[package]]
name = "zed_zig"
version = "0.1.1"
version = "0.1.2"
dependencies = [
"zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
+3 -3
View File
@@ -26,13 +26,13 @@
rustPlatform.buildRustPackage rec {
pname = "zed";
version = "0.134.4";
version = "0.135.2";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
hash = "sha256-2/onI/tc5FlwyRuu4Yq3xJYqwNXhnIrCebQQpCKGzfs=";
hash = "sha256-XnfTrcLKjJH42l9L9KxogMhNQ2u/8G4fyd6i/0dO5S0=";
fetchSubmodules = true;
};
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
"blade-graphics-0.4.0" = "sha256-J6mVvMC8u3+8RGp6qSwU/EpvdtUPyIs2Ry9XGGiimB0=";
"blade-graphics-0.4.0" = "sha256-U8278YkskWE1E60JVTx4hRv4322EV9jz8fzJkBTG3R8=";
"font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8=";
"heed-0.20.0-alpha.9" = "sha256-8bzoMmfKS+6AmeTzh0/F7WM9OBdIex+NYFER28bpA/s=";
"lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU=";