Skip to content

Commit 326467f

Browse files
authored
only warn when timeout happens (microsoft#176440)
1 parent 0f783b5 commit 326467f

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
8282
import { TerminalExitReason } from 'vs/platform/terminal/common/terminal';
8383
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
8484
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
85-
import { timeout } from 'vs/base/common/async';
85+
import { raceTimeout } from 'vs/base/common/async';
8686

8787
const QUICKOPEN_HISTORY_LIMIT_CONFIG = 'task.quickOpen.history';
8888
const PROBLEM_MATCHER_NEVER_CONFIG = 'task.problemMatchers.neverPrompt';
@@ -575,14 +575,11 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
575575
// We need to first wait for extensions to be registered because we might read
576576
// the `TaskDefinitionRegistry` in case `type` is `undefined`
577577
await this._extensionService.whenInstalledExtensionsRegistered();
578-
// Wait for the first of either to resolve
579-
await Promise.race([
580-
// Create a promise that resolves when all activation promises resolve
581-
Promise.all(
582-
this._getActivationEvents(type).map(activationEvent => this._extensionService.activateByEvent(activationEvent))
583-
),
584-
timeout(5000).then(() => console.warn('Timed out activating extensions for task providers'))
585-
]);
578+
await raceTimeout(
579+
Promise.all(this._getActivationEvents(type).map(activationEvent => this._extensionService.activateByEvent(activationEvent))),
580+
5000,
581+
() => console.warn('Timed out activating extensions for task providers')
582+
);
586583
}
587584

588585
private _updateSetup(setup?: [IWorkspaceFolder[], IWorkspaceFolder[], ExecutionEngine, JsonSchemaVersion, IWorkspace | undefined]): void {

0 commit comments

Comments
 (0)