Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/app/file_ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1481,6 +1481,10 @@ impl FerriteApp {
/// - Periodic refresh every 10 seconds when a workspace is open
/// - Debounced refresh requests (e.g., after file save)
pub(crate) fn handle_git_auto_refresh(&mut self, ctx: &egui::Context) {
if self.state.git_service.poll_status_refresh() {
ctx.request_repaint();
}

// Get window focus state
let is_focused = ctx.input(|i| i.viewport().focused.unwrap_or(true));

Expand Down
98 changes: 89 additions & 9 deletions src/ui/file_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ impl FileTreePanel {
ui_accent: Color32,
) -> FileTreeOutput {
let mut output = FileTreeOutput::default();
let aggregated_git_statuses = git_statuses.map(Self::build_git_status_index);

// Panel colors
let panel_bg = if is_dark {
Expand Down Expand Up @@ -213,7 +214,7 @@ impl FileTreePanel {
0,
is_dark,
&mut output,
git_statuses,
aggregated_git_statuses.as_ref(),
active_tab_path,
ui_accent,
panel_bg,
Expand Down Expand Up @@ -273,14 +274,7 @@ impl FileTreePanel {

// Get Git status for this node
let git_status = git_statuses
.and_then(|statuses| {
if is_dir {
// For directories, aggregate child statuses
Self::get_directory_status(&node.path, statuses)
} else {
statuses.get(&node.path).copied()
}
})
.map(|statuses| Self::status_for_path(&node.path, statuses))
.unwrap_or(GitFileStatus::Clean);

// Calculate row height for consistent sizing
Expand Down Expand Up @@ -573,6 +567,57 @@ impl FileTreePanel {
}
}

/// Build a single lookup table for both file and directory git statuses.
///
/// This avoids scanning the full status map for every directory row during
/// immediate-mode repaint, which makes large workspaces feel laggy.
fn build_git_status_index(
statuses: &HashMap<PathBuf, GitFileStatus>,
) -> HashMap<PathBuf, GitFileStatus> {
let mut aggregated = HashMap::with_capacity(statuses.len());

for (path, status) in statuses {
aggregated
.entry(path.clone())
.and_modify(|current| *current = Self::worse_status(*current, *status))
.or_insert(*status);

let mut parent = path.parent();
while let Some(dir) = parent {
aggregated
.entry(dir.to_path_buf())
.and_modify(|current| *current = Self::worse_status(*current, *status))
.or_insert(*status);
parent = dir.parent();
}
}

aggregated
}

fn status_for_path(path: &Path, statuses: &HashMap<PathBuf, GitFileStatus>) -> GitFileStatus {
if let Some(status) = statuses.get(path).copied() {
return status;
}

let mut parent = path.parent();
while let Some(dir) = parent {
if dir.as_os_str().is_empty() {
break;
}

if let Some(status @ (GitFileStatus::Untracked | GitFileStatus::Ignored)) =
statuses.get(dir).copied()
{
return status;
}

parent = dir.parent();
}

GitFileStatus::Clean
}

/// Get the aggregated Git status for a directory.
///
/// Returns the "worst" status among all files in the directory.
Expand Down Expand Up @@ -764,4 +809,39 @@ mod tests {
false,
));
}

#[test]
fn status_for_path_inherits_untracked_parent_directory() {
let repo_root = PathBuf::from("repo");
let nested_dir = repo_root.join("nested");
let nested_file = nested_dir.join("child.txt");
let sibling_file = repo_root.join("sibling.txt");

let mut statuses = HashMap::new();
statuses.insert(nested_dir, GitFileStatus::Untracked);

assert_eq!(
FileTreePanel::status_for_path(&nested_file, &statuses),
GitFileStatus::Untracked
);
assert_eq!(
FileTreePanel::status_for_path(&sibling_file, &statuses),
GitFileStatus::Clean
);
}

#[test]
fn status_for_path_does_not_inherit_modified_parent_aggregation() {
let repo_root = PathBuf::from("repo");
let nested_dir = repo_root.join("nested");
let nested_file = nested_dir.join("child.txt");

let mut statuses = HashMap::new();
statuses.insert(nested_dir, GitFileStatus::Modified);

assert_eq!(
FileTreePanel::status_for_path(&nested_file, &statuses),
GitFileStatus::Clean
);
}
}
Loading
Loading