Merge branch 'main' into project-panel-context-menu

This commit is contained in:
Max Brunsfeld 2023-11-29 09:44:48 -08:00
commit dbfc7d3555
64 changed files with 4038 additions and 2696 deletions

View file

@ -1283,16 +1283,16 @@ impl ProjectPanel {
let icon = match entry.kind {
EntryKind::File(_) => {
if show_file_icons {
Some(FileAssociations::get_icon(&entry.path, cx))
FileAssociations::get_icon(&entry.path, cx)
} else {
None
}
}
_ => {
if show_folder_icons {
Some(FileAssociations::get_folder_icon(is_expanded, cx))
FileAssociations::get_folder_icon(is_expanded, cx)
} else {
Some(FileAssociations::get_chevron_icon(is_expanded, cx))
FileAssociations::get_chevron_icon(is_expanded, cx)
}
}
};