From 354b1d7f3d70fe19a07a9167b824becb039ba843 Mon Sep 17 00:00:00 2001 From: thegecko Date: Tue, 29 Nov 2022 18:31:54 +0000 Subject: [PATCH 1/2] Remove hacked-in Extensions namespace Signed-off-by: thegecko --- .../src/node/plugin-vscode-init.ts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts index 9392b32ce6bb0..3dfc9ec91bad3 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts @@ -47,19 +47,6 @@ export const doInitialization: BackendInitializationFn = (apiFactory: PluginAPIF function createVSCodeAPI(apiFactory: PluginAPIFactory, plugin: Plugin): typeof theia { const vscode = Object.assign(apiFactory(plugin), { ExtensionKind }); - // use Theia plugin api to implement vscode extensions api - (vscode).extensions = { - get all(): any[] { - return vscode.plugins.all; - }, - getExtension(pluginId: string): any | undefined { - return vscode.plugins.getPlugin(pluginId); - }, - get onDidChange(): theia.Event { - return vscode.plugins.onDidChange; - } - }; - // override the version for vscode to be a VSCode version (vscode).version = process.env['VSCODE_API_VERSION'] || VSCODE_DEFAULT_API_VERSION; return vscode; From dbaa053b7368889cb754df8204ca0b58c205af85 Mon Sep 17 00:00:00 2001 From: robmor01 Date: Tue, 6 Dec 2022 13:51:28 +0000 Subject: [PATCH 2/2] Remove ExtensionKind override Signed-off-by: robmor01 --- packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts index 3dfc9ec91bad3..91b72ecdb2f12 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts @@ -28,11 +28,6 @@ let defaultApi: typeof theia; let isLoadOverride = false; let pluginApiFactory: PluginAPIFactory; -export enum ExtensionKind { - UI = 1, - Workspace = 2 -} - export const doInitialization: BackendInitializationFn = (apiFactory: PluginAPIFactory, plugin: Plugin) => { pluginsApiImpl.set(plugin.model.id, createVSCodeAPI(apiFactory, plugin)); plugins.push(plugin); @@ -45,7 +40,7 @@ export const doInitialization: BackendInitializationFn = (apiFactory: PluginAPIF }; function createVSCodeAPI(apiFactory: PluginAPIFactory, plugin: Plugin): typeof theia { - const vscode = Object.assign(apiFactory(plugin), { ExtensionKind }); + const vscode = apiFactory(plugin); // override the version for vscode to be a VSCode version (vscode).version = process.env['VSCODE_API_VERSION'] || VSCODE_DEFAULT_API_VERSION;