yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bad GitHub merge queue merge (#54721)

Browse Source 
No, sadly, the title is not a typo. See
https://www.githubstatus.com/incidents/zsg1lk7w13cf for the context.
I'll read with joy and popcorn through that root cause analysis.

It makes literally zero sense what happened here, but for some completly
bonkers reason GitHub completely messed up the merge queue with
https://github.com/zed-industries/zed/pull/54632.

I have no idea how it happened. It makes literally zero sense. A PR
going into the merge queue should have the same LoC when getting out of
it. GitHub obviously does not check this. GitHub causes extra work with
a feature that is supposed to save time.

Thanks, I guess.

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
This commit is contained in:
Finn EversandDanilo Leal authored and GitHub committed 2026-04-23 23:47:30 +00:00
1 parent 94ce64470a
commit c49ffd1e88
112 files changed
+6040 -1539
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/recent_projects/src/recent_projects.rs
+25 -15
View File
@@ -1020,8 +1020,11 @@ impl PickerDelegate for RecentProjectsDelegate {
.collect()
};
for (index, positions) in matched_folders {
entries.push(ProjectPickerEntry::OpenFolder { index, positions });
if !matched_folders.is_empty() {
entries.push(ProjectPickerEntry::Header("Current Folders".into()));
for (index, positions) in matched_folders {
entries.push(ProjectPickerEntry::OpenFolder { index, positions });
}
}
}
@@ -1282,7 +1285,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.child(
IconButton::new(("remove-folder", worktree_id.to_usize()), IconName::Close)
.icon_size(IconSize::Small)
.tooltip(Tooltip::text("Remove Folder from Workspace"))
.tooltip(Tooltip::text("Remove Folder from Project"))
.on_click(cx.listener(move |picker, _, window, cx| {
let Some(workspace) = picker.delegate.workspace.upgrade() else {
return;
@@ -1314,18 +1317,16 @@ impl PickerDelegate for RecentProjectsDelegate {
.child(
h_flex()
.id("open_folder_item")
.gap_3()
.w_full()
.overflow_hidden()
.gap_2p5()
.when(self.has_any_non_local_projects, |this| {
this.child(Icon::new(icon).color(Color::Muted))
})
.child(
v_flex()
.flex_1()
.min_w_0()
.child(
h_flex()
.min_w_0()
.gap_1()
.child(HighlightedLabel::new(
name.to_string(),
@@ -1335,8 +1336,7 @@ impl PickerDelegate for RecentProjectsDelegate {
this.child(
Label::new(branch)
.color(Color::Muted)
.truncate()
.flex_1(),
.truncate(),
)
})
.when(is_active, |this| {
@@ -1359,7 +1359,7 @@ impl PickerDelegate for RecentProjectsDelegate {
this.tooltip(move |_, cx| {
if let Some(branch) = tooltip_branch.clone() {
Tooltip::with_meta(
branch,
format!("{}/{}", name, branch),
None,
tooltip_path.clone(),
cx,
@@ -1384,6 +1384,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.map(|p| p.compact().to_string_lossy().to_string())
.collect();
let tooltip_path: SharedString = ordered_paths.join("\n").into();
let icon = icon_for_remote_connection(self.project_connection_options.as_ref());
let mut path_start_offset = 0;
let (match_labels, path_highlights): (Vec<_>, Vec<_>) = paths
@@ -1438,7 +1439,10 @@ impl PickerDelegate for RecentProjectsDelegate {
.child(
h_flex()
.id("open_project_info_container")
.gap_3()
.gap_2p5()
.when(self.has_any_non_local_projects, |this| {
this.child(Icon::new(icon).color(Color::Muted))
})
.child({
let mut highlighted = highlighted_match;
if !self.render_paths {
@@ -1485,6 +1489,12 @@ impl PickerDelegate for RecentProjectsDelegate {
})
.unzip();
let tooltip_title = if paths.len() > 1 {
"Add Folders to this Project"
} else {
"Add Folder to this Project"
};
let prefix = match &location {
SerializedWorkspaceLocation::Remote(options) => {
Some(SharedString::from(options.display_name()))
@@ -1509,9 +1519,9 @@ impl PickerDelegate for RecentProjectsDelegate {
.icon_size(IconSize::Small)
.tooltip(move |_, cx| {
Tooltip::with_meta(
"Add Folders to this Project",
tooltip_title,
None,
"As a multi-root folder project",
"As a multi-root folder",
cx,
)
})
@@ -1574,7 +1584,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.child(
h_flex()
.id("project_info_container")
.gap_3()
.gap_2p5()
.flex_grow()
.when(self.has_any_non_local_projects, |this| {
this.child(Icon::new(icon).color(Color::Muted))
@@ -1822,7 +1832,7 @@ impl PickerDelegate for RecentProjectsDelegate {
menu.context(focus_handle)
.when(show_add_to_workspace, |menu| {
menu.action(
"Add to this Workspace",
"Add Folder to this Project",
AddToWorkspace.boxed_clone(),
)
.separator()