mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-10 20:29:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix tab strikethrough logic (#20755)
Some checks are pending
CI / Check Postgres and Protobuf migrations, mergability (push) Waiting to run
Details
CI / Check formatting and spelling (push) Waiting to run
Details
CI / (macOS) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Build Remote Server (push) Waiting to run
Details
CI / (Windows) Run Clippy and tests (push) Waiting to run
Details
CI / Create a macOS bundle (push) Blocked by required conditions
Details
CI / Create a Linux bundle (push) Blocked by required conditions
Details
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Details
Deploy Docs / Deploy Docs (push) Waiting to run
Details
Docs / Check formatting (push) Waiting to run
Details

Browse source 
This fix was in downstream commits before splitting out #20711, should
have tested locally before merging.

Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2024-11-15 17:14:49 -07:00 committed by GitHub
parent 6e296eb4b6
commit f34877334e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/editor/src/items.rs
View file

@ -635,12 +635,13 @@ impl Item for Editor {
Some(util::truncate_and_trailoff(description, MAX_TAB_TITLE_LEN)) Some(util::truncate_and_trailoff(description, MAX_TAB_TITLE_LEN))
}); });
let is_deleted: bool = self // Whether the file was saved in the past but is now deleted.
let was_deleted: bool = self
.buffer() .buffer()
.read(cx) .read(cx)
.as_singleton() .as_singleton()
.and_then(|buffer| buffer.read(cx).file()) .and_then(|buffer| buffer.read(cx).file())
.map_or(true, |file| file.is_deleted()); .map_or(false, |file| file.is_deleted() && file.is_created());
h_flex() h_flex()
.gap_2() .gap_2()
@ -648,7 +649,7 @@ impl Item for Editor {
Label::new(self.title(cx).to_string()) Label::new(self.title(cx).to_string())
.color(label_color) .color(label_color)
.italic(params.preview) .italic(params.preview)
.strikethrough(is_deleted), .strikethrough(was_deleted),
) )
.when_some(description, |this, description| { .when_some(description, |this, description| {
this.child( this.child(