Skip to content

fix(navigator-contribution): close #11425, show NEW_FILE and NEW_FOLDER #11427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yiliang114 wants to merge 1 commit into from
Closed

fix(navigator-contribution): close #11425, show NEW_FILE and NEW_FOLDER #11427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions packages/navigator/src/browser/navigator-contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,17 @@ export namespace FileNavigatorCommands {
label: 'Collapse Folders in Explorer',
iconClass: codicon('collapse-all')
});
// for these new commands in front of navigator toolbar with icons
export const NEW_FILE = Command.toDefaultLocalizedCommand({
...CommonCommands.NEW_FILE,
id: `${CommonCommands.NEW_FILE.id}.withIconClass`,
iconClass: codicon('new-file')
});
export const NEW_FOLDER = Command.toDefaultLocalizedCommand({
...WorkspaceCommands.NEW_FOLDER,
id: `${WorkspaceCommands.NEW_FOLDER.id}.withIconClass`,
iconClass: codicon('new-folder')
});
export const ADD_ROOT_FOLDER: Command = {
id: 'navigator.addRootFolder'
};
Expand Down Expand Up @@ -308,6 +319,16 @@ export class FileNavigatorContribution extends AbstractViewContribution<FileNavi
isEnabled: widget => this.withWidget(widget, () => this.workspaceService.opened),
isVisible: widget => this.withWidget(widget, () => this.workspaceService.opened)
});
registry.registerCommand(FileNavigatorCommands.NEW_FILE, {
execute: (...args) => registry.executeCommand(CommonCommands.NEW_FILE.id, ...args),
isEnabled: widget => this.withWidget(widget, () => this.workspaceService.opened),
isVisible: widget => this.withWidget(widget, () => this.workspaceService.opened)
});
registry.registerCommand(FileNavigatorCommands.NEW_FOLDER, {
execute: (...args) => registry.executeCommand(WorkspaceCommands.NEW_FOLDER.id, ...args),
isEnabled: widget => this.withWidget(widget, () => this.workspaceService.opened),
isVisible: widget => this.withWidget(widget, () => this.workspaceService.opened)
});
registry.registerCommand(FileNavigatorCommands.ADD_ROOT_FOLDER, {
execute: (...args) => registry.executeCommand(WorkspaceCommands.ADD_FOLDER.id, ...args),
isEnabled: (...args) => registry.isEnabled(WorkspaceCommands.ADD_FOLDER.id, ...args),
Expand Down Expand Up @@ -560,29 +581,29 @@ export class FileNavigatorContribution extends AbstractViewContribution<FileNavi
}

async registerToolbarItems(toolbarRegistry: TabBarToolbarRegistry): Promise<void> {
toolbarRegistry.registerItem({
id: FileNavigatorCommands.NEW_FILE.id,
command: FileNavigatorCommands.NEW_FILE.id,
tooltip: FileNavigatorCommands.NEW_FILE.label,
priority: 0,
});
toolbarRegistry.registerItem({
id: FileNavigatorCommands.NEW_FOLDER.id,
command: FileNavigatorCommands.NEW_FOLDER.id,
tooltip: FileNavigatorCommands.NEW_FOLDER.label,
priority: 1,
});
toolbarRegistry.registerItem({
id: FileNavigatorCommands.REFRESH_NAVIGATOR.id,
command: FileNavigatorCommands.REFRESH_NAVIGATOR.id,
tooltip: nls.localizeByDefault('Refresh Explorer'),
priority: 0,
priority: 2,
});
toolbarRegistry.registerItem({
id: FileNavigatorCommands.COLLAPSE_ALL.id,
command: FileNavigatorCommands.COLLAPSE_ALL.id,
tooltip: nls.localizeByDefault('Collapse All'),
priority: 1,
});
this.registerMoreToolbarItem({
id: CommonCommands.NEW_FILE.id,
command: CommonCommands.NEW_FILE.id,
tooltip: CommonCommands.NEW_FILE.label,
group: NavigatorMoreToolbarGroups.NEW_OPEN,
});
this.registerMoreToolbarItem({
id: WorkspaceCommands.NEW_FOLDER.id,
command: WorkspaceCommands.NEW_FOLDER.id,
tooltip: WorkspaceCommands.NEW_FOLDER.label,
group: NavigatorMoreToolbarGroups.NEW_OPEN,
priority: 3,
});
this.registerMoreToolbarItem({
id: FileNavigatorCommands.TOGGLE_AUTO_REVEAL.id,
Expand Down