From c6f6e227308dac3e37ddc7fc67ae6f65e0fafc6b Mon Sep 17 00:00:00 2001
From: Igor Vinokur <ivinokur@redhat.com>
Date: Thu, 24 Sep 2020 16:09:59 +0300
Subject: [PATCH] Apply revealInExplorer vscode command

Signed-off-by: Igor Vinokur <ivinokur@redhat.com>
---
 .../src/browser/navigator-contribution.ts     |  4 ++-
 .../plugin-vscode-commands-contribution.ts    | 28 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/navigator/src/browser/navigator-contribution.ts b/packages/navigator/src/browser/navigator-contribution.ts
index da3dfc4b29d9c..5244968cfbc05 100644
--- a/packages/navigator/src/browser/navigator-contribution.ts
+++ b/packages/navigator/src/browser/navigator-contribution.ts
@@ -155,6 +155,8 @@ export namespace NavigatorContextMenu {
     export const OPEN_WITH = [...NAVIGATION, 'open_with'];
 }
 
+export const FILE_NAVIGATOR_TOGGLE_COMMAND_ID = 'fileNavigator:toggle';
+
 @injectable()
 export class FileNavigatorContribution extends AbstractViewContribution<FileNavigatorWidget> implements FrontendApplicationContribution, TabBarToolbarContribution {
 
@@ -200,7 +202,7 @@ export class FileNavigatorContribution extends AbstractViewContribution<FileNavi
                 area: 'left',
                 rank: 100
             },
-            toggleCommandId: 'fileNavigator:toggle',
+            toggleCommandId: FILE_NAVIGATOR_TOGGLE_COMMAND_ID,
             toggleKeybinding: 'ctrlcmd+shift+e'
         });
     }
diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts
index 75927e485fa28..67c61aad77477 100755
--- a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts
+++ b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts
@@ -55,7 +55,12 @@ import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { TerminalFrontendContribution } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
 import { QuickOpenWorkspace } from '@theia/workspace/lib/browser/quick-open-workspace';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
-import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
+import {
+    FileNavigatorCommands,
+    FILE_NAVIGATOR_TOGGLE_COMMAND_ID
+} from '@theia/navigator/lib/browser/navigator-contribution';
+import { FILE_NAVIGATOR_ID, FileNavigatorWidget } from '@theia/navigator/lib/browser';
+import { SelectableTreeNode } from '@theia/core/lib/browser/tree/tree-selection';
 
 export namespace VscodeCommands {
     export const OPEN: Command = {
@@ -574,5 +579,26 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
         }, {
             execute: () => commands.executeCommand(FileNavigatorCommands.COPY_RELATIVE_FILE_PATH.id)
         });
+        commands.registerCommand({
+            id: 'revealInExplorer'
+        }, {
+            execute: async (resource: URI | object) => {
+                if (!URI.isUri(resource)) {
+                    return;
+                }
+                let navigator = await this.shell.revealWidget(FILE_NAVIGATOR_ID);
+                if (!navigator) {
+                    await this.commandService.executeCommand(FILE_NAVIGATOR_TOGGLE_COMMAND_ID);
+                    navigator = await this.shell.revealWidget(FILE_NAVIGATOR_ID);
+                }
+                if (navigator instanceof FileNavigatorWidget) {
+                    const model = navigator.model;
+                    const node = await model.revealFile(new TheiaURI(resource));
+                    if (SelectableTreeNode.is(node)) {
+                        model.selectNode(node);
+                    }
+                }
+            }
+        });
     }
 }