mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 21:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fmt

Browse source
This commit is contained in:
Mikayla Maki 2023-07-17 13:12:14 -07:00
parent 8c855680e7
commit aacc4bb8b0
No known key found for this signature in database
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/project_panel/src/project_panel.rs
View file

@ -237,7 +237,8 @@ impl ProjectPanel {
cx.observe_global::<FileAssociations, _>(|_, cx| { cx.observe_global::<FileAssociations, _>(|_, cx| {
cx.notify(); cx.notify();
}).detach(); })
.detach();
let view_id = cx.view_id(); let view_id = cx.view_id();
let mut this = Self { let mut this = Self {
@ -1192,8 +1193,7 @@ impl ProjectPanel {
for entry in visible_worktree_entries[entry_range].iter() { for entry in visible_worktree_entries[entry_range].iter() {
let status = git_status_setting.then(|| entry.git_status).flatten(); let status = git_status_setting.then(|| entry.git_status).flatten();
let is_expanded = expanded_entry_ids.binary_search(&entry.id).is_ok(); let is_expanded = expanded_entry_ids.binary_search(&entry.id).is_ok();
let icon = show_file_icons let icon = show_file_icons.then(|| match entry.kind {
.then(|| match entry.kind {
EntryKind::File(_) => FileAssociations::get_icon(&entry.path, cx), EntryKind::File(_) => FileAssociations::get_icon(&entry.path, cx),
_ => FileAssociations::get_folder_icon(is_expanded, cx), _ => FileAssociations::get_folder_icon(is_expanded, cx),
}); });

3
crates/zed/src/main.rs
View file

@ -702,7 +702,8 @@ fn watch_file_types(fs: Arc<dyn Fs>, cx: &mut AppContext) {
}); });
}) })
} }
}).detach() })
.detach()
} }
#[cfg(not(debug_assertions))] #[cfg(not(debug_assertions))]