Skip to content

Fix cleaning up workspace folders w/ multiple folders present #2027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plemarquand merged 1 commit into from
Jan 6, 2026
Merged

Fix cleaning up workspace folders w/ multiple folders present #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions src/PackageWatcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ export class PackageWatcher {
watcher.onDidDelete(async () => await this.handleWorkspaceStateChange());

if (await fileExists(uri.fsPath)) {
// TODO: Remove this
this.logger.info("Loading initial workspace-state.json");
await this.handleWorkspaceStateChange();
}

Expand Down Expand Up @@ -195,10 +193,6 @@ export class PackageWatcher {
*/
private async handleWorkspaceStateChange() {
await this.folderContext.reloadWorkspaceState();
// TODO: Remove this
this.logger.info(
`Package watcher state updated workspace-state.json: ${JSON.stringify(this.folderContext.swiftPackage.workspaceState, null, 2)}`
);
await this.folderContext.fireEvent(FolderOperation.workspaceStateUpdated);
}
}
2 changes: 1 addition & 1 deletion src/WorkspaceContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ export class WorkspaceContext implements vscode.Disposable {
async removeWorkspaceFolder(workspaceFolder: vscode.WorkspaceFolder) {
for (const folder of this.folders) {
if (folder.workspaceFolder !== workspaceFolder) {
return;
continue;
}
// if current folder is this folder send unfocus event by setting
// current folder to undefined
Expand Down