Building... never stops (fix #214859) (#215409)

microsoft · Jun 13, 2024 · d8abddc · d8abddc
1 parent e4caee4
commit d8abddc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -50,9 +50,13 @@ export class ProgressService extends Disposable implements IProgressService {
  async withProgress<R = unknown>(options: IProgressOptions, originalTask: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: (choice?: number) => void): Promise<R> {
  const { location } = options;
 
- const task = (progress: IProgress<IProgressStep>) => {
+ const task = async (progress: IProgress<IProgressStep>) => {
  const activeLock = this.userActivityService.markActive();
- return originalTask(progress).finally(() => activeLock.dispose());
+ try {
+ return await originalTask(progress);
+ } finally {
+ activeLock.dispose();
+ }
  };
 
  const handleStringLocation = (location: string) => {