Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add staged status information to diff hunks (#24475)

Browse source 
Release Notes:

- Render unstaged hunks in the project diff editor with a slashed
background

---------

Co-authored-by: maxbrunsfeld <max@zed.dev>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
Cole Miller 2025-02-10 21:43:25 -05:00 • committed by GitHub
parent a9de9e3cb4
commit 8f75fe25e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 1132 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Cargo.lock generated
View file

@ -2024,6 +2024,24 @@ dependencies = [
"serde",
]
[[package]]
name = "buffer_diff"
version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.31",
"git2",
"gpui",
"language",
"pretty_assertions",
"rope",
"serde_json",
"sum_tree",
"text",
"unindent",
"util",
]
[[package]]
name = "built"
version = "0.7.5"
@ -2742,6 +2760,7 @@ dependencies = [
"axum",
"axum-extra",
"base64 0.22.1",
"buffer_diff",
"call",
"channel",
"chrono",
@ -2753,7 +2772,6 @@ dependencies = [
"ctor",
"dashmap 6.1.0",
"derive_more",
"diff 0.1.0",
"editor",
"env_logger 0.11.6",
"envy",
@ -3860,24 +3878,6 @@ dependencies = [
"zeroize",
]
[[package]]
name = "diff"
version = "0.1.0"
dependencies = [
"futures 0.3.31",
"git2",
"gpui",
"language",
"log",
"pretty_assertions",
"rope",
"serde_json",
"sum_tree",
"text",
"unindent",
"util",
]
[[package]]
name = "diff"
version = "0.1.13"
@ -4041,6 +4041,7 @@ dependencies = [
"aho-corasick",
"anyhow",
"assets",
"buffer_diff",
"chrono",
"client",
"clock",
@ -4048,7 +4049,6 @@ dependencies = [
"convert_case 0.7.1",
"ctor",
"db",
"diff 0.1.0",
"emojis",
"env_logger 0.11.6",
"file_icons",
@ -5347,9 +5347,9 @@ name = "git_ui"
version = "0.1.0"
dependencies = [
"anyhow",
"buffer_diff",
"collections",
"db",
"diff 0.1.0",
"editor",
"feature_flags",
"futures 0.3.31",
@ -7980,10 +7980,10 @@ name = "multi_buffer"
version = "0.1.0"
dependencies = [
"anyhow",
"buffer_diff",
"clock",
"collections",
"ctor",
"diff 0.1.0",
"env_logger 0.11.6",
"futures 0.3.31",
"gpui",
@ -9995,7 +9995,7 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
dependencies = [
"diff 0.1.13",
"diff",
"yansi",
]
@ -10088,10 +10088,10 @@ dependencies = [
"aho-corasick",
"anyhow",
"async-trait",
"buffer_diff",
"client",
"clock",
"collections",
"diff 0.1.0",
"env_logger 0.11.6",
"fancy-regex 0.14.0",
"fs",