Merge branch 'master' into serialize-webview

Signed-off-by: Vitaliy Gulyy <[email protected]>
eclipse-che · Sep 16, 2020 · 3105f6d · 3105f6d
2 parents 0becb21 + 503ca56
commit 3105f6d
Show file tree

Hide file tree

Showing 20 changed files with 1,567 additions and 34 deletions.
diff --git a/dockerfiles/theia/docker/alpine/runtime-install-dependencies.dockerfile b/dockerfiles/theia/docker/alpine/runtime-install-dependencies.dockerfile
@@ -6,4 +6,5 @@
 # Install ssh for cloning ssh-repositories
 # Install less for handling git diff properly
 # Install sshpass for handling passwords for SSH keys
-RUN apk add --update --no-cache sudo git bzip2 which bash curl openssh openssh-keygen less sshpass
+# Install lsblk as Theia requires it
+RUN apk add --update --no-cache sudo git bzip2 which bash curl openssh openssh-keygen less sshpass lsblk
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-api-provider.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-api-provider.ts
@@ -25,6 +25,7 @@ import { CheSideCarContentReaderMainImpl } from './che-sidecar-content-reader-ma
 import { CheGithubMainImpl } from './che-github-main';
 import { CheOpenshiftMainImpl } from './che-openshift-main';
 import { CheOauthMainImpl } from './che-oauth-main';
+import { CheLanguagesTestAPIImpl } from './che-languages-test-api';
 
 @injectable()
 export class CheApiProvider implements MainPluginApiProvider {
@@ -43,6 +44,7 @@ export class CheApiProvider implements MainPluginApiProvider {
         rpc.set(PLUGIN_RPC_CONTEXT.CHE_USER_MAIN, new CheUserMainImpl(container));
         rpc.set(PLUGIN_RPC_CONTEXT.CHE_PRODUCT_MAIN, new CheProductMainImpl(container, rpc));
         rpc.set(PLUGIN_RPC_CONTEXT.CHE_SIDERCAR_CONTENT_READER_MAIN, new CheSideCarContentReaderMainImpl(container, rpc));
+        rpc.set(PLUGIN_RPC_CONTEXT.CHE_LANGUAGES_TEST_API_MAIN, new CheLanguagesTestAPIImpl(container));
     }
 
 }
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-frontend-module.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-frontend-module.ts
@@ -54,6 +54,11 @@ import { CheTaskResolver } from './che-task-resolver';
 import { CheTaskTerminalWidgetManager } from './che-task-terminal-widget-manager';
 import { TaskTerminalWidgetManager } from '@theia/task/lib/browser/task-terminal-widget-manager';
 import { ContainerPicker } from './container-picker';
+import { ChePluginHandleRegistry } from './che-plugin-handle-registry';
+import { CheLanguagesMainTestImpl } from './che-languages-test-main';
+import { RPCProtocol } from '@theia/plugin-ext/lib/common/rpc-protocol';
+import { interfaces } from 'inversify';
+import { LanguagesMainFactory } from '@theia/plugin-ext';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(CheApiProvider).toSelf().inSingletonScope();
@@ -122,4 +127,12 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
     bind(CheTaskTerminalWidgetManager).toSelf().inSingletonScope();
     rebind(TaskTerminalWidgetManager).toService(CheTaskTerminalWidgetManager);
+
+    bind(ChePluginHandleRegistry).toSelf().inSingletonScope();
+    bind(CheLanguagesMainTestImpl).toSelf().inTransientScope();
+    rebind(LanguagesMainFactory).toFactory((context: interfaces.Context) => (rpc: RPCProtocol) => {
+        const child = context.container.createChild();
+        child.bind(RPCProtocol).toConstantValue(rpc);
+        return child.get(CheLanguagesMainTestImpl);
+    });
 });