Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move to file/newFile... contribution point
Close #128136
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; | ||
| import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; | ||
| import { assertIsDefined } from 'vs/base/common/types'; | ||
| import { localize } from 'vs/nls'; | ||
| import { Action2, IMenuService, MenuId, registerAction2, IMenu, MenuRegistry } from 'vs/platform/actions/common/actions'; | ||
| import { ICommandService } from 'vs/platform/commands/common/commands'; | ||
| import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; | ||
|
|
||
| import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; | ||
| import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; | ||
| import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; | ||
| import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput'; | ||
| import { Registry } from 'vs/platform/registry/common/platform'; | ||
| import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions'; | ||
| import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; | ||
| import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'; | ||
|
|
||
|
|
||
| const category = localize('Create', "Create"); | ||
|
|
||
| export const HasMultipleNewFileEntries = new RawContextKey<boolean>('hasMultipleNewFileEntries', false); | ||
|
|
||
| registerAction2(class extends Action2 { | ||
| constructor() { | ||
| super({ | ||
| id: 'welcome.showNewFileEntries', | ||
| title: localize('welcome.newFile', "New File..."), | ||
| category, | ||
| f1: true, | ||
| keybinding: { | ||
| primary: KeyMod.Alt + KeyMod.CtrlCmd + KeyMod.WinCtrl + KeyCode.KEY_N, | ||
| weight: KeybindingWeight.WorkbenchContrib, | ||
| }, | ||
| menu: { | ||
| id: MenuId.MenubarFileMenu, | ||
| when: HasMultipleNewFileEntries, | ||
| group: '1_new', | ||
| order: 3 | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| run(accessor: ServicesAccessor) { | ||
| assertIsDefined(NewFileTemplatesManager.Instance).run(); | ||
| } | ||
| }); | ||
|
|
||
| type NewFileItem = { commandID: string, title: string, from: string, group: string }; | ||
| class NewFileTemplatesManager extends Disposable { | ||
| static Instance: NewFileTemplatesManager | undefined; | ||
|
|
||
| private menu: IMenu; | ||
|
|
||
| private registry = new Map<string, NewFileItem>(); | ||
|
|
||
| constructor( | ||
| @IQuickInputService private readonly quickInputService: IQuickInputService, | ||
| @IContextKeyService private readonly contextKeyService: IContextKeyService, | ||
| @ICommandService private readonly commandService: ICommandService, | ||
| @IKeybindingService private readonly keybindingService: IKeybindingService, | ||
| @IExtensionService private readonly extensionService: IExtensionService, | ||
| @IMenuService menuService: IMenuService, | ||
| ) { | ||
| super(); | ||
|
|
||
| NewFileTemplatesManager.Instance = this; | ||
|
|
||
| this._register({ dispose() { if (NewFileTemplatesManager.Instance === this) { NewFileTemplatesManager.Instance = undefined; } } }); | ||
| this._register(this.extensionService.onDidChangeExtensions(() => this.cacheRawContributionData())); | ||
| this.cacheRawContributionData(); | ||
|
|
||
| this.menu = menuService.createMenu(MenuId.NewFile, contextKeyService); | ||
| this.updateContextKeys(); | ||
| this._register(this.menu.onDidChange(() => { this.updateContextKeys(); })); | ||
| } | ||
|
|
||
| private async cacheRawContributionData() { | ||
| const allExts = await this.extensionService.getExtensions(); | ||
| for (const ext of allExts) { | ||
| const contribution = ext.contributes?.menus?.['file/newFile']; | ||
| if (contribution?.length) { | ||
| contribution.forEach(menu => this.registry.set(menu.command, { | ||
| commandID: menu.command, | ||
| from: ext.displayName ?? ext.name, | ||
| title: (menu as any).title, | ||
| group: menu.group?.toLowerCase() ?? '', | ||
| })); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private allEntries(): NewFileItem[] { | ||
| const items: NewFileItem[] = []; | ||
| for (const [group, actions] of this.menu.getActions()) { | ||
| for (const action of actions) { | ||
| const registered = this.registry.get(action.id); | ||
| if (registered) { | ||
| if (!registered.title) { registered.title = action.label; } | ||
| items.push(registered); | ||
| } | ||
| else { | ||
| items.push({ commandID: action.id, from: localize('Built-In', "Built-In"), title: action.label, group: group }); | ||
| } | ||
| } | ||
| } | ||
| return items; | ||
| } | ||
|
|
||
| private updateContextKeys() { | ||
| HasMultipleNewFileEntries.bindTo(this.contextKeyService).set(this.allEntries().length > 1); | ||
| } | ||
|
|
||
| run() { | ||
| const entries = this.allEntries(); | ||
| if (entries.length === 0) { | ||
| throw Error('Unexpected empty new items list'); | ||
| } | ||
| else if (entries.length === 1) { | ||
| this.commandService.executeCommand(entries[0].commandID); | ||
| } | ||
| else { | ||
| this.selectNewEntry(entries); | ||
| } | ||
| } | ||
|
|
||
| private async selectNewEntry(entries: NewFileItem[]) { | ||
| const disposables = new DisposableStore(); | ||
| const qp = this.quickInputService.createQuickPick(); | ||
| qp.title = localize('createNew', "Create New..."); | ||
| qp.matchOnDetail = true; | ||
| qp.matchOnDescription = true; | ||
|
|
||
| const sortCategories = (a: string, b: string): number => { | ||
| const categoryPriority: Record<string, number> = { 'file': 1, 'notebook': 2 }; | ||
| if (categoryPriority[a] && categoryPriority[b]) { return categoryPriority[b] - categoryPriority[a]; } | ||
| if (categoryPriority[a]) { return 1; } | ||
| if (categoryPriority[b]) { return -1; } | ||
| return a.localeCompare(b); | ||
| }; | ||
|
|
||
| const displayCategory: Record<string, string> = { | ||
| 'file': localize('file', "File"), | ||
| 'notebook': localize('notebook', "Notebook"), | ||
| }; | ||
|
|
||
| const refreshQp = (entries: NewFileItem[]) => { | ||
| const items: (((IQuickPickItem & NewFileItem) | IQuickPickSeparator))[] = []; | ||
| let lastSeparator: string | undefined; | ||
| entries | ||
| .sort((a, b) => -sortCategories(a.group, b.group)) | ||
| .forEach((entry) => { | ||
| const command = entry.commandID; | ||
| const keybinding = this.keybindingService.lookupKeybinding(command || '', this.contextKeyService); | ||
| if (lastSeparator !== entry.group) { | ||
| items.push({ | ||
| type: 'separator', | ||
| label: displayCategory[entry.group] ?? entry.group | ||
| }); | ||
| lastSeparator = entry.group; | ||
| } | ||
| items.push({ | ||
| ...entry, | ||
| label: entry.title, | ||
| type: 'item', | ||
| keybinding, | ||
| buttons: command ? [ | ||
| { | ||
| iconClass: 'codicon codicon-gear', | ||
| tooltip: localize('change keybinding', "Configure Keybinding") | ||
| } | ||
| ] : [], | ||
| detail: '', | ||
| description: entry.from, | ||
| }); | ||
| }); | ||
| qp.items = items; | ||
| }; | ||
| refreshQp(entries); | ||
|
|
||
| disposables.add(this.menu.onDidChange(() => refreshQp(this.allEntries()))); | ||
|
|
||
| disposables.add(qp.onDidAccept(async e => { | ||
| const selected = qp.selectedItems[0] as (IQuickPickItem & NewFileItem); | ||
| if (selected) { await this.commandService.executeCommand(selected.commandID); } | ||
| qp.hide(); | ||
| })); | ||
|
|
||
| disposables.add(qp.onDidHide(() => { | ||
| qp.dispose(); | ||
| disposables.dispose(); | ||
| })); | ||
|
|
||
| disposables.add(qp.onDidTriggerItemButton(e => { | ||
| qp.hide(); | ||
| this.commandService.executeCommand('workbench.action.openGlobalKeybindings', (e.item as any).action.runCommand); | ||
| })); | ||
|
|
||
| qp.show(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench) | ||
| .registerWorkbenchContribution(NewFileTemplatesManager, LifecyclePhase.Restored); | ||
|
|
||
| MenuRegistry.appendMenuItem(MenuId.NewFile, { | ||
| group: 'File', | ||
| command: { | ||
| id: 'workbench.action.files.newUntitledFile', | ||
| title: localize('miNewFile2', "Text File") | ||
| }, | ||
| order: 1 | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
@JacksonKearl 👀 can you clarify what that means?