Implement 'more' toolbar item for the explorer

Fixes #5951
Fixes #6010

- added a toolbar item which contains multiple commands for the explorer.
- adjusted the `WorkspaceRootUriAwareCommandHandler` to better handle commands
which deal with single and multi-root workspaces.

Signed-off-by: Vincent Fugnitto <[email protected]>

packages/navigator/src/browser/navigator-contribution.ts

@@ -21,7 +21,7 @@ import {
     OpenerService, FrontendApplicationContribution, FrontendApplication, CompositeTreeNode
 } from '@theia/core/lib/browser';
 import { FileDownloadCommands } from '@theia/filesystem/lib/browser/download/file-download-command-contribution';
-import { CommandRegistry, MenuModelRegistry, MenuPath, isOSX, Command, DisposableCollection } from '@theia/core/lib/common';
+import { CommandRegistry, MenuModelRegistry, MenuPath, isOSX, Command, DisposableCollection, Mutable } from '@theia/core/lib/common';
 import { SHELL_TABBAR_CONTEXT_MENU } from '@theia/core/lib/browser';
 import { WorkspaceCommands, WorkspaceService, WorkspacePreferences } from '@theia/workspace/lib/browser';
 import { FILE_NAVIGATOR_ID, FileNavigatorWidget, EXPLORER_VIEW_CONTAINER_ID } from './navigator-widget';
@@ -30,7 +30,7 @@ import { NavigatorKeybindingContexts } from './navigator-keybinding-context';
 import { FileNavigatorFilter } from './navigator-filter';
 import { WorkspaceNode } from './navigator-tree';
 import { NavigatorContextKeyService } from './navigator-context-key-service';
-import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { TabBarToolbarContribution, TabBarToolbarRegistry, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { FileSystemCommands } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
 import { NavigatorDiff, NavigatorDiffCommands } from './navigator-diff';
 import { UriSelection } from '@theia/core/lib/common/selection';
@@ -61,6 +61,14 @@ export namespace FileNavigatorCommands {
     };
 }
 
+/**
+ * Navigator `More Actions...` toolbar item groups.
+ * Used in order to group items present in the toolbar.
+ */
+export namespace NavigatorMoreToolbarGroups {
+    export const NEW_OPEN = '1_navigator_new_open';
+}
+
 export const NAVIGATOR_CONTEXT_MENU: MenuPath = ['navigator-context-menu'];
 
 /**
@@ -95,6 +103,9 @@ export namespace NavigatorContextMenu {
 @injectable()
 export class FileNavigatorContribution extends AbstractViewContribution<FileNavigatorWidget> implements FrontendApplicationContribution, TabBarToolbarContribution {
 
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
     @inject(NavigatorContextKeyService)
     protected readonly contextKeyService: NavigatorContextKeyService;
 
@@ -340,6 +351,37 @@ export class FileNavigatorContribution extends AbstractViewContribution<FileNavi
             tooltip: 'Collapse All',
             priority: 1,
         });
+
+        // Register 'more actions...' toolbar item which consists of multiple commands.
+        const navigatorRegisterItem = (item: Mutable<TabBarToolbarItem>) => {
+            const commandId = item.command;
+            const id = 'navigator.tabbar.toolbar.' + commandId;
+            const command = this.commandRegistry.getCommand(commandId);
+            this.commandRegistry.registerCommand({ id, iconClass: command && command.iconClass }, {
+                execute: (w, ...args) => w instanceof FileNavigatorWidget
+                    && this.commandRegistry.executeCommand(commandId, ...args),
+                isEnabled: (w, ...args) => w instanceof FileNavigatorWidget
+                    && this.commandRegistry.isEnabled(commandId, ...args),
+                isVisible: (w, ...args) => w instanceof FileNavigatorWidget
+                    && this.commandRegistry.isVisible(commandId, ...args),
+                isToggled: (w, ...args) => w instanceof FileNavigatorWidget
+                    && this.commandRegistry.isToggled(commandId, ...args),
+            });
+            item.command = id;
+            toolbarRegistry.registerItem(item);
+        };
+        navigatorRegisterItem({
+            id: WorkspaceCommands.NEW_FILE.id,
+            command: WorkspaceCommands.NEW_FILE.id,
+            tooltip: WorkspaceCommands.NEW_FILE.label,
+            group: NavigatorMoreToolbarGroups.NEW_OPEN,
+        });
+        navigatorRegisterItem({
+            id: WorkspaceCommands.NEW_FOLDER.id,
+            command: WorkspaceCommands.NEW_FOLDER.id,
+            tooltip: WorkspaceCommands.NEW_FOLDER.label,
+            group: NavigatorMoreToolbarGroups.NEW_OPEN,
+        });
     }
 
     /**

packages/workspace/src/browser/workspace-commands.ts

@@ -447,15 +447,29 @@ export class WorkspaceRootUriAwareCommandHandler extends UriAwareCommandHandler<
         super(selectionService, handler);
     }
 
+    isVisible(): boolean {
+        return !!this.workspaceService.tryGetRoots().length;
+    }
+
+    isEnabled(): boolean {
+        return !!this.workspaceService.tryGetRoots().length;
+    }
+
     protected getUri(): URI | undefined {
         const uri = super.getUri();
-        if (this.workspaceService.isMultiRootWorkspaceEnabled) {
-            return uri;
-        }
+        // If the URI is available, return it immediately.
         if (uri) {
             return uri;
         }
-        const root = this.workspaceService.tryGetRoots()[0];
+        // If a multi-root workspace is currently opened with at least one root,
+        // return the URI of the first available root.
+        if (this.workspaceService.isMultiRootWorkspaceOpened &&
+            !!this.workspaceService.tryGetRoots().length) {
+            const firstRoot = this.workspaceService.tryGetRoots()[0];
+            return new URI(firstRoot.uri);
+        }
+        // Return the workspace root URI if available.
+        const root = this.workspaceService.workspace;
         return root && new URI(root.uri);
     }