From 83f3bcd03eaee0a6deafcd4a42a4d460ab5080c0 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 19 Aug 2020 13:09:00 +0200 Subject: [PATCH] chore - inline single-use function --- .../contrib/format/browser/formatActionsNone.ts | 9 ++++++++- .../contrib/format/browser/showExtensionQuery.ts | 15 --------------- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 src/vs/workbench/contrib/format/browser/showExtensionQuery.ts diff --git a/src/vs/workbench/contrib/format/browser/formatActionsNone.ts b/src/vs/workbench/contrib/format/browser/formatActionsNone.ts index 18b3e2b6f8d..9355b4e6dc1 100644 --- a/src/vs/workbench/contrib/format/browser/formatActionsNone.ts +++ b/src/vs/workbench/contrib/format/browser/formatActionsNone.ts @@ -14,7 +14,14 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis import { ICommandService } from 'vs/platform/commands/common/commands'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; -import { showExtensionQuery } from 'vs/workbench/contrib/format/browser/showExtensionQuery'; +import { VIEWLET_ID, IExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/common/extensions'; + +async function showExtensionQuery(viewletService: IViewletService, query: string) { + const viewlet = await viewletService.openViewlet(VIEWLET_ID, true); + if (viewlet) { + (viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer).search(query); + } +} registerEditorAction(class FormatDocumentMultipleAction extends EditorAction { diff --git a/src/vs/workbench/contrib/format/browser/showExtensionQuery.ts b/src/vs/workbench/contrib/format/browser/showExtensionQuery.ts deleted file mode 100644 index cfb1a4da14d..00000000000 --- a/src/vs/workbench/contrib/format/browser/showExtensionQuery.ts +++ /dev/null @@ -1,15 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; -import { VIEWLET_ID, IExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/common/extensions'; - -export function showExtensionQuery(viewletService: IViewletService, query: string) { - return viewletService.openViewlet(VIEWLET_ID, true).then(viewlet => { - if (viewlet) { - (viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer).search(query); - } - }); -}