fix code action race condition (microsoft#232752)

Author: justschen

src/vs/editor/contrib/codeAction/browser/codeAction.ts

@@ -26,9 +26,6 @@ import { IProgress, Progress } from '../../../../platform/progress/common/progre
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { CodeActionFilter, CodeActionItem, CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource, filtersAction, mayIncludeActionsOfKind } from '../common/types.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
-import { raceTimeout } from '../../../../base/common/async.js';
-
-
 
 export const codeActionCommandId = 'editor.action.codeAction';
 export const quickFixCommandId = 'editor.action.quickFix';
@@ -123,10 +120,9 @@ export async function getCodeActions(
 
 	const disposables = new DisposableStore();
 	const promises = providers.map(async provider => {
+		const handle = setTimeout(() => progress.report(provider), 1250);
 		try {
-			const codeActionsPromise = Promise.resolve(provider.provideCodeActions(model, rangeOrSelection, codeActionContext, cts.token));
-
-			const providedCodeActions = await raceTimeout(codeActionsPromise, 1250, () => progress.report(provider));
+			const providedCodeActions = await provider.provideCodeActions(model, rangeOrSelection, codeActionContext, cts.token);
 
 			if (providedCodeActions) {
 				disposables.add(providedCodeActions);
@@ -148,6 +144,8 @@ export async function getCodeActions(
 			}
 			onUnexpectedExternalError(err);
 			return emptyCodeActionsResponse;
+		} finally {
+			clearTimeout(handle);
 		}
 	});