From 8aaa7daf838cd503f36c1c320a465ef448db5b24 Mon Sep 17 00:00:00 2001 From: Shohruh Ismoilov Date: Wed, 11 Nov 2026 17:54:16 +0500 Subject: [PATCH] fix(project): keep workspace project icons stable on removal (#2699) Removing a member from a workspace reset every detected project type, so the remaining members briefly showed folder icons and fell back to name order. The cached types of members still in the same workspace are kept while the rescan runs. Co-authored-by: shohruh-genius <7658451+shohruh-genius@users.noreply.github.com> --- e2e/workspaceProjectTypes.spec.ts | 65 +++++++++++++++++++++++++ src/features/project-tree/store.test.ts | 16 ++++++ src/features/project-tree/store.ts | 13 ++++- 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/e2e/workspaceProjectTypes.spec.ts b/e2e/workspaceProjectTypes.spec.ts index 15b539ab3..bf056ef73 100644 --- a/e2e/workspaceProjectTypes.spec.ts +++ b/e2e/workspaceProjectTypes.spec.ts @@ -134,3 +134,68 @@ test("sorts collapsed workspace roots by project type, shows their icons and ref ]); await expect(tree.getByRole("treeitem", { selected: true })).toContainText("z-web"); }); + +test("keeps surviving workspace icons and type order during removal", async ({ workbench: page }) => { + await stubDesktop(page); + await page.evaluate(async () => { + const module = "/src/platform/project.ts"; + const { useProject } = await import(/* @vite-ignore */ module); + const current = useProject.getState().project; + const projects = ["/work/a-go", "/work/b-web", "/work/z-rust"]; + const project = { + ...current, + root: "/workspace", + name: "Workspace", + workspace: { version: 1, name: "Workspace", projects }, + }; + const markers: Record = { + "/work/a-go": "go.mod", + "/work/b-web": "package.json", + "/work/z-rust": "Cargo.toml", + }; + const rescan = new Promise((resolve) => { + window.__ipc.handlers.finish_workspace_rescan = () => resolve(); + }); + let removed = false; + window.__ipc.handlers.fs_read_dir = async ({ path }) => { + if (removed) await rescan; + const name = markers[String(path)]; + return name + ? [{ path: `${path}/${name}`, name, kind: "file", size: 0, mtimeMs: 0, ignored: false, excluded: false }] + : []; + }; + window.__ipc.handlers.project_roots = () => ({ folders: [] }); + window.__ipc.handlers.workspace_update = ({ projects }) => { + removed = true; + return { ...project, workspace: { ...project.workspace, projects } }; + }; + useProject.setState({ project }); + }); + + const tree = page.getByRole("tree", { name: "Project" }); + const rust = tree.locator('[data-project-path="/work/z-rust"]'); + const go = tree.locator('[data-project-path="/work/a-go"]'); + const web = tree.locator('[data-project-path="/work/b-web"]'); + const icons = () => + Promise.all( + [rust, go].map((row) => + row.locator("svg path").evaluateAll((paths) => paths.map((path) => path.getAttribute("d"))), + ), + ); + const panel = page.getByRole("region", { name: "Project", exact: true }); + await panel.getByRole("button", { name: "Collapse All", exact: true }).click(); + await panel.getByRole("button", { name: "Options", exact: true }).click(); + await page.getByRole("menuitemcheckbox", { name: "Sort by Type", exact: true }).click(); + const rows = tree.locator('[data-project-path^="/work/"]'); + await expect(rows).toHaveText(["z-rust/work/z-rust", "a-go/work/a-go", "b-web/work/b-web"]); + const before = await icons(); + + await web.click({ button: "right" }); + await page.getByRole("menuitem", { name: "Remove from Workspace", exact: true }).click(); + await expect(web).toHaveCount(0); + await page.screenshot({ path: test.info().outputPath("workspace-removal.png"), animations: "disabled" }); + expect(await icons()).toEqual(before); + await expect(rows).toHaveText(["z-rust/work/z-rust", "a-go/work/a-go"]); + + await page.evaluate(() => window.__ipc.handlers.finish_workspace_rescan!({})); +}); diff --git a/src/features/project-tree/store.test.ts b/src/features/project-tree/store.test.ts index 865cb6280..86edbd66b 100644 --- a/src/features/project-tree/store.test.ts +++ b/src/features/project-tree/store.test.ts @@ -43,6 +43,22 @@ afterEach(() => { const childLabels = (key: string) => (currentModel().children.get(key) ?? []).map((n) => n.label); +it("retains cached types only for members that remain in the same workspace", () => { + initProjectTree("/workspace", "Workspace", ["/go", "/web"]); + useProjectTree.setState({ + projectTypes: new Map([ + ["/go", "go"], + ["/web", "node"], + ]), + }); + + initProjectTree("/workspace", "Workspace", ["/go", "/new"]); + expect([...useProjectTree.getState().projectTypes]).toEqual([["/go", "go"]]); + + initProjectTree("/other-workspace", "Other workspace", ["/go"]); + expect(useProjectTree.getState().projectTypes.size).toBe(0); +}); + describe("lazy loading", () => { it("loads folders on demand and shares concurrent requests", async () => { const spy = vi.spyOn(fs, "readDir"); diff --git a/src/features/project-tree/store.ts b/src/features/project-tree/store.ts index 2be28734f..1e8b5d6a5 100644 --- a/src/features/project-tree/store.ts +++ b/src/features/project-tree/store.ts @@ -321,16 +321,25 @@ export function initProjectTree( clearTimeout(persistTimer); modeExpanded.clear(); autoExpanded.clear(); - const previousMode = get().mode; + const previous = get(); + const previousMode = previous.mode; const mode = unity && previousMode === "project" ? "unity" : !unity && previousMode === "unity" ? "project" : previousMode; + // Keep the remaining members' types visible while the workspace is rescanned. + const projectTypes = new Map(); + if (root === previous.root && members) { + for (const member of members) { + const type = previous.projectTypes.get(member); + if (type) projectTypes.set(member, type); + } + } set({ unity, mode, root, name, members, - projectTypes: new Map(), + projectTypes, listings: new Map(), expanded: initialExpanded(root, mode, members), selected: new Set(),