Intercept uri arguments and set container name into file scheme

Signed-off-by: Vladyslav Zhukovskyi <[email protected]>

extensions/eclipse-che-theia-plugin-remote/src/node/execute-command-container-aware.ts

@@ -0,0 +1,25 @@
+/*********************************************************************
+ * Copyright (c) 2019 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import { CommandRegistryImpl } from '@theia/plugin-ext/lib/plugin/command-registry';
+import { overrideUri } from './che-content-aware-utils';
+
+export class ExecuteCommandContainerAware {
+    static makeExecuteCommandContainerAware(commandRegistryExt: CommandRegistryImpl) {
+        const executeCommandContainerAware = new ExecuteCommandContainerAware();
+        executeCommandContainerAware.overrideExecuteCommand(commandRegistryExt);
+    }
+
+    overrideExecuteCommand(commandRegistryExt: CommandRegistryImpl) {
+        const originalExecuteCommand = commandRegistryExt.executeCommand.bind(commandRegistryExt);
+        // tslint:disable-next-line:no-any
+        const executeCommand = (id: string, ...args: any[]) => originalExecuteCommand(id, ...args.map(arg => arg.scheme ? overrideUri(arg) : arg));
+        commandRegistryExt.executeCommand = executeCommand;
+    }
+}

extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote-init.ts

@@ -36,6 +36,7 @@ import { Deferred } from '@theia/core/lib/common/promise-util';
 import { DocumentContainerAware } from './document-container-aware';
 import { LanguagesContainerAware } from './languages-container-aware';
 import { PluginManagerExtImpl } from '@theia/plugin-ext/lib/plugin/plugin-manager';
+import { ExecuteCommandContainerAware } from './execute-command-container-aware';
 
 interface CheckAliveWS extends ws {
     alive: boolean;
@@ -214,6 +215,8 @@ to pick-up automatically a free port`));
         DocumentContainerAware.makeDocumentContainerAware((webSocketClient.rpc as any).locals.get(MAIN_RPC_CONTEXT.DOCUMENTS_EXT.id));
         // tslint:disable-next-line:no-any
         LanguagesContainerAware.makeLanguagesContainerAware((webSocketClient.rpc as any).locals.get(MAIN_RPC_CONTEXT.LANGUAGES_EXT.id));
+        // tslint:disable-next-line:no-any
+        ExecuteCommandContainerAware.makeExecuteCommandContainerAware((webSocketClient.rpc as any).locals.get(MAIN_RPC_CONTEXT.COMMAND_REGISTRY_EXT.id));
 
         let channelName = '';
         if (process.env.CHE_MACHINE_NAME) {