Skip to content

Fix timeout leaks #2556

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

Draft
DonJayamanne wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix timeout leaks #2556

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
14 changes: 6 additions & 8 deletions src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,28 +877,24 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
// Migrate changes from active repository to worktree
const activeRepository = this.gitService.activeRepository.get();
if (activeRepository) {
const disposable = new DisposableStore();
try {
stream.progress(vscode.l10n.t('Migrating changes to worktree...'));
// Wait for the worktree repository to be ready
const worktreeRepo = await new Promise<typeof activeRepository | undefined>((resolve) => {
const disposable = this.gitService.onDidOpenRepository(repo => {
disposable.add(this.gitService.onDidOpenRepository(repo => {
if (isEqual(repo.rootUri, worktreePath)) {
disposable.dispose();
resolve(repo);
}
});
}));

this.gitService.getRepository(worktreePath).then(repo => {
if (repo) {
disposable.dispose();
resolve(repo);
}
});

setTimeout(() => {
disposable.dispose();
resolve(undefined);
}, 10_000);
disposable.add(disposableTimeout(() => resolve(undefined), 10_000));
});

if (!worktreeRepo) {
Expand All @@ -914,6 +910,8 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
} catch (error) {
// Continue even if migration fails
stream.warning(vscode.l10n.t('Failed to migrate some changes: {0}. Continuing with worktree creation.', error instanceof Error ? error.message : String(error)));
} finally {
disposable.dispose();
}
}

Expand Down
Loading