From ab9c8e833dbc99d624a1a4e8b7b3cecbfbdf974f Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 21 Jul 2025 17:21:50 -0700 Subject: [PATCH] Revert lib change for now Will revisit later --- src/tsconfig.base.json | 3 +-- src/vs/editor/contrib/hover/browser/getHover.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json index 914de756a07..6d276949648 100644 --- a/src/tsconfig.base.json +++ b/src/tsconfig.base.json @@ -19,8 +19,7 @@ "ES2022", "DOM", "DOM.Iterable", - "WebWorker.ImportScripts", - "ESNext.Array" + "WebWorker.ImportScripts" ], "allowSyntheticDefaultImports": true } diff --git a/src/vs/editor/contrib/hover/browser/getHover.ts b/src/vs/editor/contrib/hover/browser/getHover.ts index 11f72445b74..c51250bc294 100644 --- a/src/vs/editor/contrib/hover/browser/getHover.ts +++ b/src/vs/editor/contrib/hover/browser/getHover.ts @@ -40,10 +40,12 @@ export function getHoverProviderResultsAsAsyncIterable(registry: LanguageFeature return AsyncIterableObject.fromPromisesResolveOrder(promises).coalesce(); } -export function getHoversPromise(registry: LanguageFeatureRegistry, model: ITextModel, position: Position, token: CancellationToken, recursive = false): Promise { - return Array.fromAsync( - getHoverProviderResultsAsAsyncIterable(registry, model, position, token, recursive), - item => item.hover); +export async function getHoversPromise(registry: LanguageFeatureRegistry, model: ITextModel, position: Position, token: CancellationToken, recursive = false): Promise { + const out: Hover[] = []; + for await (const item of getHoverProviderResultsAsAsyncIterable(registry, model, position, token, recursive)) { + out.push(item.hover); + } + return out; } registerModelAndPositionCommand('_executeHoverProvider', (accessor, model, position): Promise => {