[plugin] map dependencies to vscode builtins properly

Signed-off-by: Sven Efftinge <sven.efftinge@typefox.io>
eclipse-theia · Sep 18, 2019 · 5917e4f · 5917e4f
1 parent df1e55a
commit 5917e4f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts
@@ -142,7 +142,10 @@ export class PluginDeployerImpl implements PluginDeployer {
                 if (extensionDependencies && deployableExtensionDependencies) {
                     for (let dependencyIndex = 0; dependencyIndex < extensionDependencies.length; dependencyIndex++) {
                         const dependencyId = extensionDependencies[dependencyIndex].toLowerCase();
-                        if (!pluginsToDeploy.has(dependencyId)) {
+                        if (!pluginsToDeploy.has(dependencyId) &&
+                            // translate vscode builtins. See https://github.com/theia-ide/vscode-builtin-extensions/blob/master/src/republish.js#L50
+                            !(dependencyId.startsWith('vscode.') &&
+                                pluginsToDeploy.has('vscode.@theia/vscode-builtin-' + dependencyId.substr('vscode.'.length)))) {
                             const deployableDependency = deployableExtensionDependencies[dependencyIndex];
                             if (deployableDependency) {
                                 queue.push(deployableDependency);