From 58af3c55a580fd85dc424a60842f95baa3bbff8d Mon Sep 17 00:00:00 2001 From: Vadim Lazuk Date: Fri, 13 Nov 2026 16:46:42 +0300 Subject: [PATCH] fix(git-toolbox): show the focused file's branch in workspace windows (#3159) In a workspace window the plugin asked vcs_status of the window's project, the workspace container, which is usually not a git repository, so the branch item disappeared and Fetch Now fetched nothing. Git Toolbox now resolves the editor-focused file to the deepest open project containing it and shows that repository, falling back to the window's project, the one shown last, then the first open one. Fetch Now fetches only the repository the status bar shows. Covered by plugin unit tests and a host e2e test with a two-member workspace. Fixes #2556 Co-authored-by: Inf1mum <8135225+Inf1mum@users.noreply.github.com> --- crates/ide-host/tests/plugins.rs | 76 ++++++++++ plugins/official/git-toolbox/dist/plugin.wasm | Bin 182895 -> 185911 bytes .../git-toolbox/dist/plugin.wasm.sources | 2 +- plugins/official/git-toolbox/src/lib.rs | 141 ++++++++++++++---- 4 files changed, 188 insertions(+), 31 deletions(-) diff --git a/crates/ide-host/tests/plugins.rs b/crates/ide-host/tests/plugins.rs index 9fb54b9f1..2e09e8e76 100644 --- a/crates/ide-host/tests/plugins.rs +++ b/crates/ide-host/tests/plugins.rs @@ -2609,6 +2609,82 @@ fn git_toolbox_does_not_fetch_untrusted_projects() { assert!(err.contains("Restricted Mode"), "{err}"); } +/// Git Toolbox in a workspace window whose container folder is not a +/// repository (every member is its own clone): the status bar follows the +/// focused file's repository, and the scheduled fetch covers every member. +#[test] +fn official_git_toolbox_follows_members_in_a_workspace() { + let f = fixture(Limits { idle_timeout: Some(Duration::from_millis(50)), ..Limits::default() }); + let tmp = tempfile::tempdir().unwrap(); + // A remote with `main`, cloned by member `a` (at `main`) and member `b` + // (on its own branch, to tell the two apart in the status bar). + let remote = tmp.path().join("remote.git"); + std::fs::create_dir(&remote).unwrap(); + git(&remote, &["init", "--bare", "-b", "main"]); + let seed = tmp.path().join("seed"); + std::fs::create_dir(&seed).unwrap(); + git(&seed, &["init", "-b", "main"]); + std::fs::write(seed.join("seed.txt"), "seed\n").unwrap(); + git(&seed, &["add", "."]); + git(&seed, &["commit", "-m", "one"]); + git(&seed, &["remote", "add", "origin", remote.to_str().unwrap()]); + git(&seed, &["push", "-u", "origin", "main"]); + let member_a = tmp.path().join("member-a"); + git(tmp.path(), &["clone", remote.to_str().unwrap(), member_a.to_str().unwrap()]); + let member_a = dunce::canonicalize(member_a).unwrap(); + let member_b = tmp.path().join("member-b"); + git(tmp.path(), &["clone", remote.to_str().unwrap(), member_b.to_str().unwrap()]); + let member_b = dunce::canonicalize(member_b).unwrap(); + git(&member_b, &["checkout", "-b", "feature"]); + git(&member_b, &["push", "-u", "origin", "feature"]); + // The window's project is the container; the members are attached to it. + f.workspace.other_roots.lock().extend([member_a.clone(), member_b.clone()]); + + f.install(&official("git-toolbox")); + let item = |host: &PluginHost| { + host.status_items().into_iter().find(|(p, id, _)| p == "openidea.git-toolbox" && id == "branch") + }; + let now = Instant::now(); + let focus = |path: &Path| { + f.host + .post_events(Some("main"), vec![WorkbenchEvent::EditorFocused(Some(path.to_string_lossy().into_owned()))]); + f.host.flush_events_at(now + Duration::from_secs(3)); + f.host.wait_events(Duration::from_secs(10)); + }; + // Focusing a file of member `a` shows that member's branch: the window's + // project is the container, which is no repository. + focus(&member_a.join("seed.txt")); + assert_eq!(item(&f.host).map(|(_, _, i)| i.text), Some("main".into())); + // Fetch Now fetches the shown member; the container is not a repository. + f.run("openidea.git-toolbox", "fetch", None).unwrap(); + let fetched = stored(&f, "openidea.git-toolbox"); + assert!( + fetched.iter().any(|(key, _)| key == &format!("last-fetch:{}", to_ipc(&member_a))), + "{member_a:?}: {fetched:?}" + ); + assert_eq!(fetched.iter().filter(|(key, _)| key.starts_with("last-fetch:")).count(), 1, "{fetched:?}"); + // Switching to the other member follows it. + focus(&member_b.join("seed.txt")); + assert_eq!(item(&f.host).map(|(_, _, i)| i.text), Some("feature".into())); + + // Idle: reclaimed; the schedule then wakes it to fetch every member (the + // container is skipped: it has no repository). + std::thread::sleep(Duration::from_millis(100)); + f.host.tick(); + assert_eq!(item(&f.host).map(|(_, _, i)| i.text), Some("feature".into()), "the item stays while it sleeps"); + f.take_events(); + f.host.tick_at(Instant::now() + Duration::from_secs(301)); + assert!(f.host.wait_events(Duration::from_secs(30))); + let fetched = stored(&f, "openidea.git-toolbox"); + for member in [&member_a, &member_b] { + assert!( + fetched.iter().any(|(key, _)| key == &format!("last-fetch:{}", to_ipc(member))), + "{member:?}: {fetched:?}" + ); + } + assert_eq!(item(&f.host).map(|(_, _, i)| i.text), Some("feature".into())); +} + /// A tiny HTTP server: each request is answered after `delay(n)` (n counts /// requests) with `body`. Returns its port and the request bodies it got. fn http_server( diff --git a/plugins/official/git-toolbox/dist/plugin.wasm b/plugins/official/git-toolbox/dist/plugin.wasm index a278415278fbaeb7f2ac301963c17a6ce1d8649c..2276ccf62117807217726cc4bf45b352a6f122fc 100644 GIT binary patch delta 36330 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

Ev#(Y|61zD>45JUf-Q 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τt;@}x<5#Qi4N=@w2(vo9~uHiCTQj) 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 diff --git a/plugins/official/git-toolbox/dist/plugin.wasm.sources b/plugins/official/git-toolbox/dist/plugin.wasm.sources index 1cedc1a4a..1d1296f9e 100644 --- a/plugins/official/git-toolbox/dist/plugin.wasm.sources +++ b/plugins/official/git-toolbox/dist/plugin.wasm.sources @@ -1 +1 @@ -63847067fc7b9931a3d697d8e6649cea04a0af7ad02d57e26a38f9acb2e6fcdd +d6991b9065d8b623efdf9c03fb92b4875e95e666b3dadb3925ff5ad327f5fdcb diff --git a/plugins/official/git-toolbox/src/lib.rs b/plugins/official/git-toolbox/src/lib.rs index 5201eae95..66ee65c01 100644 --- a/plugins/official/git-toolbox/src/lib.rs +++ b/plugins/official/git-toolbox/src/lib.rs @@ -1,6 +1,6 @@ //! Git Toolbox for OpenIDEA: background fetch of every open project's //! repository (on the plugin's `on-schedule`, which also fires after the -//! instance was reclaimed while idle), and the focused project's branch with +//! instance was reclaimed while idle), and the focused file's branch with //! its ahead/behind counts in the status bar. use openidea_plugin::host::{self, storage}; @@ -14,7 +14,12 @@ const LAST_FETCH: &str = "last-fetch:"; const SHOWN: &str = "shown-root"; #[derive(Default)] -pub struct GitToolbox; +pub struct GitToolbox { + /// The focused editor's file path, from the last `editor-focused` event. + /// Kept across events: the status bar keeps following that file's + /// repository until another file takes focus. + focused: Option, +} fn now_secs() -> u64 { std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map(|d| d.as_secs()).unwrap_or(0) @@ -67,31 +72,51 @@ fn tooltip(s: &RepositoryStatus) -> String { lines.join("\n") } -/// Shows `project`'s repository in the status bar (or hides the item). -fn show(project: &Project) -> Result<(), Error> { - match project.vcs_status()? { - Some(s) => { +/// Shows the first of `projects` that has a repository in the status bar (the +/// item hides when none has). Returns the index of the one shown. +fn show(projects: &[Project]) -> Result, Error> { + for (i, project) in projects.iter().enumerate() { + if let Some(s) = project.vcs_status()? { let _ = storage::set(SHOWN, &project.root()?); host::set_status_item( ITEM, &StatusItem { text: label(&s), tooltip: Some(tooltip(&s)), command: Some("fetch".into()) }, ); + return Ok(Some(i)); } - None => host::remove_status_item(ITEM), } - Ok(()) + host::remove_status_item(ITEM); + Ok(None) } -/// The project the status bar follows: the invoking window's, else the one -/// shown last, else the first open one. -fn current(ctx: &Invocation) -> Option { - if let Some(p) = ctx.project() { - return Some(p); +impl GitToolbox { + /// The projects the status bar may follow, most specific first: the + /// focused file's repository (a workspace window's project is the + /// container folder, and its focused files belong to member + /// repositories), the invoking window's, the one shown last, else the + /// first open one. + fn candidates(&self, ctx: &Invocation) -> Vec { + let mut out: Vec = Vec::new(); + let editor = ctx.editor().map(|e| e.path()); + let mut push = |project: Option| { + if let Some(p) = project + && let Ok(root) = p.root() + && out.iter().all(|q| q.root() != Ok(root.clone())) + { + out.push(p); + } + }; + push(self.focused.as_deref().or(editor.as_deref()).and_then(host::project_of)); + push(ctx.project()); + let projects = host::projects().unwrap_or_default(); + let shown = storage::get(SHOWN).ok().flatten(); + let index = projects.iter().position(|p| p.root().ok().as_deref() == shown.as_deref()).unwrap_or(0); + let mut rest = projects; + if index < rest.len() { + push(Some(rest.swap_remove(index))); + } + out } - let projects = host::projects().ok()?; - let shown = storage::get(SHOWN).ok().flatten(); - let index = projects.iter().position(|p| p.root().ok() == shown).unwrap_or(0); - projects.into_iter().nth(index) } /// Fetches `projects` in one cancellable task. Returns how many were fetched. @@ -131,15 +156,22 @@ fn fetch(projects: &[Project]) -> Result { impl Plugin for GitToolbox { fn run_command(&mut self, id: &str, ctx: &Invocation, _arg: Option<&str>) -> Result, Error> { - let project = current(ctx).ok_or("no project is open")?; + let projects = self.candidates(ctx); + if projects.is_empty() { + return Err("no project is open".into()); + } match id { "fetch" => { - let n = fetch(std::slice::from_ref(&project))?; - show(&project)?; + // Only the repository the status bar shows, not every candidate. + let Some(i) = show(&projects)? else { + return Ok(Some("The project is not in a git repository.".to_owned())); + }; + let n = fetch(std::slice::from_ref(&projects[i]))?; + show(&projects)?; Ok((n == 0).then(|| "The project is not in a git repository.".to_owned())) } "refresh" => { - show(&project)?; + show(&projects)?; Ok(None) } _ => Err(Error::NotFound(format!("command {id}"))), @@ -155,9 +187,12 @@ impl Plugin for GitToolbox { host::notify(NotificationLevel::Warning, "Git Toolbox: fetch failed", &e.to_string()); } } - if let Some(p) = current(ctx) { - let _ = show(&p); + for e in events { + if let Event::EditorFocused(Some(path)) = e { + self.focused = Some(path.clone()); + } } + let _ = show(&self.candidates(ctx)); } } @@ -195,7 +230,7 @@ mod tests { let host = MockHost::install(); host.add_project("/other"); host.set_vcs_status(Some(status(0, 4))); - GitToolbox.handle_events(&[Event::Scheduled], &host.invocation()); + GitToolbox::default().handle_events(&[Event::Scheduled], &host.invocation()); assert_eq!(host.fetches(), 2, "every open project"); let item = &host.status_items()["branch"]; assert_eq!(item.text, "main ↓4"); @@ -208,26 +243,72 @@ mod tests { #[test] fn focus_changes_only_refresh() { let host = MockHost::install(); + let mut plugin = GitToolbox::default(); host.set_vcs_status(Some(status(1, 0))); - GitToolbox.handle_events(&[Event::EditorFocused(Some("/project/a.rs".into()))], &host.invocation()); + plugin.handle_events(&[Event::EditorFocused(Some("/project/a.rs".into()))], &host.invocation()); assert_eq!(host.fetches(), 0); assert_eq!(host.status_items()["branch"].text, "main ↑1"); host.set_vcs_status(None); - GitToolbox.handle_events(&[Event::VcsChanged("/project".into())], &host.invocation()); + plugin.handle_events(&[Event::VcsChanged("/project".into())], &host.invocation()); assert!(host.status_items().is_empty(), "not a repository any more"); } + /// A workspace window's project is the container folder, which is no + /// repository: the focused file's member repository is shown instead, and + /// follows the focus between members. + #[test] + fn workspace_windows_follow_the_focused_members_repository() { + let host = MockHost::install(); + let mut plugin = GitToolbox::default(); + host.set_project_root(Some("/workspace")); + host.add_project("/repos/a"); + host.add_project("/repos/b"); + host.set_vcs_status(Some(status(1, 2))); + plugin.handle_events(&[Event::EditorFocused(Some("/repos/a/src/main.rs".into()))], &host.invocation()); + assert_eq!(host.storage()["shown-root"], "/repos/a", "the focused file's member, not the container"); + assert_eq!(host.status_items()["branch"].text, "main ↑1 ↓2"); + plugin.handle_events(&[Event::EditorFocused(Some("/repos/b/src/lib.rs".into()))], &host.invocation()); + assert_eq!(host.storage()["shown-root"], "/repos/b", "the focus moved to the other member"); + // A scheduled tick keeps following the focused member. + plugin.handle_events(&[Event::Scheduled], &host.invocation()); + assert_eq!(host.storage()["shown-root"], "/repos/b"); + } + + /// Fetch Now fetches the repository the status bar shows, not every + /// other open project. + #[test] + fn fetch_now_fetches_only_the_shown_repository() { + let host = MockHost::install(); + host.add_project("/other"); + storage::set(SHOWN, "/other").unwrap(); + host.set_vcs_status(Some(status(0, 0))); + GitToolbox::default().run_command("fetch", &host.invocation(), None).unwrap(); + assert_eq!(host.fetches(), 1); + assert_eq!(host.storage()["shown-root"], "/project"); + } + + /// A focused path outside every open project falls back to the window's + /// project, whose repository is shown as before. + #[test] + fn an_unresolvable_focused_path_falls_back_to_the_window_project() { + let host = MockHost::install(); + host.set_vcs_status(Some(status(0, 0))); + GitToolbox::default().handle_events(&[Event::EditorFocused(Some("src/main.rs".into()))], &host.invocation()); + assert_eq!(host.storage()["shown-root"], "/project"); + assert_eq!(host.status_items()["branch"].text, "main"); + } + #[test] fn failures_and_cancellation() { let host = MockHost::install(); host.set_vcs_status(Some(status(0, 0))); host.fail_fetch(Some(Error::Failed("no network".into()))); - GitToolbox.handle_events(&[Event::Scheduled], &host.invocation()); + GitToolbox::default().handle_events(&[Event::Scheduled], &host.invocation()); assert_eq!(host.notifications()[0].body, "no network"); - let err = GitToolbox.run_command("fetch", &host.invocation(), None).unwrap_err(); + let err = GitToolbox::default().run_command("fetch", &host.invocation(), None).unwrap_err(); assert_eq!(err, Error::Failed("no network".into())); host.fail_fetch(Some(Error::Cancelled)); - GitToolbox.handle_events(&[Event::Scheduled], &host.invocation()); + GitToolbox::default().handle_events(&[Event::Scheduled], &host.invocation()); assert_eq!(host.notifications().len(), 1, "a cancelled fetch is not an error to report"); } @@ -235,7 +316,7 @@ mod tests { fn without_vcs_write_it_still_shows_the_branch() { let host = MockHost::install().with_capabilities(&["project.read", "vcs.read", "storage"]); host.set_vcs_status(Some(status(0, 1))); - GitToolbox.handle_events(&[Event::Scheduled], &host.invocation()); + GitToolbox::default().handle_events(&[Event::Scheduled], &host.invocation()); assert!(host.notifications()[0].body.contains("vcs.write")); assert_eq!(host.status_items()["branch"].text, "main ↓1"); }