@theia/plugin-ext-vscode 1.28.0-next.39 → 1.28.0-next.45

package/lib/node/local-vsix-file-plugin-deployer-resolver.d.ts

@@ -0,0 +1,15 @@
+import { PluginDeployerResolverContext } from '@theia/plugin-ext';
+import { LocalPluginDeployerResolver } from '@theia/plugin-ext/lib/main/node/resolvers/local-plugin-deployer-resolver';
+import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';
+export declare class LocalVSIXFilePluginDeployerResolver extends LocalPluginDeployerResolver {
+    static LOCAL_FILE: string;
+    protected readonly environment: PluginVSCodeEnvironment;
+    protected get supportedScheme(): string;
+    accept(pluginId: string): boolean;
+    resolveFromLocalPath(pluginResolverContext: PluginDeployerResolverContext, localPath: string): Promise<void>;
+    /**
+     * Ensures that a user-installed plugin file is transferred to the user extension folder.
+     */
+    protected ensureDiscoverability(localPath: string): Promise<string>;
+}
+//# sourceMappingURL=local-vsix-file-plugin-deployer-resolver.d.ts.map

package/lib/node/local-vsix-file-plugin-deployer-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-vsix-file-plugin-deployer-resolver.d.ts","sourceRoot":"","sources":["../../src/node/local-vsix-file-plugin-deployer-resolver.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,0EAA0E,CAAC;AACvH,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,qBACa,mCAAoC,SAAQ,2BAA2B;IAChF,MAAM,CAAC,UAAU,SAAgB;IAEA,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC;IAEzF,SAAS,KAAK,eAAe,IAAI,MAAM,CAEtC;IAEQ,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIpC,oBAAoB,CAAC,qBAAqB,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlH;;OAEG;cACa,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAgB5E"}

package/lib/node/local-vsix-file-plugin-deployer-resolver.js

@@ -0,0 +1,78 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var LocalVSIXFilePluginDeployerResolver_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalVSIXFilePluginDeployerResolver = void 0;
+const fs = require("@theia/core/shared/fs-extra");
+const path = require("path");
+const inversify_1 = require("@theia/core/shared/inversify");
+const node_1 = require("@theia/core/lib/node");
+const local_plugin_deployer_resolver_1 = require("@theia/plugin-ext/lib/main/node/resolvers/local-plugin-deployer-resolver");
+const plugin_vscode_environment_1 = require("../common/plugin-vscode-environment");
+const plugin_vscode_file_handler_1 = require("./plugin-vscode-file-handler");
+let LocalVSIXFilePluginDeployerResolver = LocalVSIXFilePluginDeployerResolver_1 = class LocalVSIXFilePluginDeployerResolver extends local_plugin_deployer_resolver_1.LocalPluginDeployerResolver {
+    get supportedScheme() {
+        return LocalVSIXFilePluginDeployerResolver_1.LOCAL_FILE;
+    }
+    accept(pluginId) {
+        return super.accept(pluginId) && (0, plugin_vscode_file_handler_1.isVSCodePluginFile)(pluginId);
+    }
+    async resolveFromLocalPath(pluginResolverContext, localPath) {
+        const fileName = path.basename(localPath);
+        const pathInUserExtensionsDirectory = await this.ensureDiscoverability(localPath);
+        pluginResolverContext.addPlugin(fileName, pathInUserExtensionsDirectory);
+    }
+    /**
+     * Ensures that a user-installed plugin file is transferred to the user extension folder.
+     */
+    async ensureDiscoverability(localPath) {
+        const userExtensionsDir = await this.environment.getExtensionsDirUri();
+        if (!userExtensionsDir.isEqualOrParent(node_1.FileUri.create(localPath))) {
+            try {
+                const newPath = node_1.FileUri.fsPath(userExtensionsDir.resolve(path.basename(localPath)));
+                await fs.mkdirp(node_1.FileUri.fsPath(userExtensionsDir));
+                await new Promise((resolve, reject) => {
+                    fs.copyFile(localPath, newPath, error => error ? reject(error) : resolve());
+                });
+                return newPath;
+            }
+            catch (e) {
+                console.warn(`Problem copying plugin at ${localPath}:`, e);
+            }
+        }
+        return localPath;
+    }
+};
+LocalVSIXFilePluginDeployerResolver.LOCAL_FILE = 'local-file';
+__decorate([
+    (0, inversify_1.inject)(plugin_vscode_environment_1.PluginVSCodeEnvironment),
+    __metadata("design:type", plugin_vscode_environment_1.PluginVSCodeEnvironment)
+], LocalVSIXFilePluginDeployerResolver.prototype, "environment", void 0);
+LocalVSIXFilePluginDeployerResolver = LocalVSIXFilePluginDeployerResolver_1 = __decorate([
+    (0, inversify_1.injectable)()
+], LocalVSIXFilePluginDeployerResolver);
+exports.LocalVSIXFilePluginDeployerResolver = LocalVSIXFilePluginDeployerResolver;
+//# sourceMappingURL=local-vsix-file-plugin-deployer-resolver.js.map

package/lib/node/local-vsix-file-plugin-deployer-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-vsix-file-plugin-deployer-resolver.js","sourceRoot":"","sources":["../../src/node/local-vsix-file-plugin-deployer-resolver.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,kDAAkD;AAClD,6BAA6B;AAC7B,4DAAkE;AAClE,+CAA+C;AAE/C,6HAAuH;AACvH,mFAA8E;AAC9E,6EAAkE;AAGlE,IAAa,mCAAmC,2CAAhD,MAAa,mCAAoC,SAAQ,4DAA2B;IAKhF,IAAc,eAAe;QACzB,OAAO,qCAAmC,CAAC,UAAU,CAAC;IAC1D,CAAC;IAEQ,MAAM,CAAC,QAAgB;QAC5B,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAA,+CAAkB,EAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,qBAAoD,EAAE,SAAiB;QAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,6BAA6B,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAClF,qBAAqB,CAAC,SAAS,CAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;IAC7E,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,qBAAqB,CAAC,SAAiB;QACnD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QACvE,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE;YAC/D,IAAI;gBACA,MAAM,OAAO,GAAG,cAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBACpF,MAAM,EAAE,CAAC,MAAM,CAAC,cAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBACnD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACxC,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBAChF,CAAC,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC;aAClB;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,6BAA6B,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;aAC9D;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AArCU,8CAAU,GAAG,YAAY,CAAC;AAEA;IAAhC,IAAA,kBAAM,EAAC,mDAAuB,CAAC;8BAAiC,mDAAuB;wEAAC;AAHhF,mCAAmC;IAD/C,IAAA,sBAAU,GAAE;GACA,mCAAmC,CAsC/C;AAtCY,kFAAmC"}

package/lib/node/plugin-vscode-backend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-vscode-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/plugin-vscode-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAc/D,wBAgBG"}
+{"version":3,"file":"plugin-vscode-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/plugin-vscode-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAe/D,wBAkBG"}

package/lib/node/plugin-vscode-backend-module.js

@@ -26,6 +26,7 @@ const common_1 = require("@theia/plugin-ext/lib/common");
 const plugin_vscode_environment_1 = require("../common/plugin-vscode-environment");
 const plugin_vscode_deployer_participant_1 = require("./plugin-vscode-deployer-participant");
 const plugin_reader_1 = require("./plugin-reader");
+const local_vsix_file_plugin_deployer_resolver_1 = require("./local-vsix-file-plugin-deployer-resolver");
 exports.default = new inversify_1.ContainerModule(bind => {
     bind(plugin_vscode_environment_1.PluginVSCodeEnvironment).toSelf().inSingletonScope();
     bind(plugin_vscode_deployer_participant_1.PluginVSCodeDeployerParticipant).toSelf().inSingletonScope();
@@ -38,5 +39,6 @@ exports.default = new inversify_1.ContainerModule(bind => {
     bind(common_1.PluginHostEnvironmentVariable).toService(plugin_vscode_cli_contribution_1.PluginVsCodeCliContribution);
     bind(plugin_reader_1.HostedPluginReader).toSelf().inSingletonScope();
     bind(node_1.BackendApplicationContribution).toService(plugin_reader_1.HostedPluginReader);
+    bind(plugin_ext_1.PluginDeployerResolver).to(local_vsix_file_plugin_deployer_resolver_1.LocalVSIXFilePluginDeployerResolver).inSingletonScope();
 });
 //# sourceMappingURL=plugin-vscode-backend-module.js.map

package/lib/node/plugin-vscode-backend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-vscode-backend-module.js","sourceRoot":"","sources":["../../src/node/plugin-vscode-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;AAEhF,4DAA+D;AAC/D,kDAE2B;AAC3B,6EAAuE;AACvE,uFAAiF;AACjF,qDAAuD;AACvD,qFAA+E;AAC/E,+CAAuF;AACvF,yDAA6E;AAC7E,mFAA8E;AAC9E,6FAAuF;AACvF,mDAAqD;AAErD,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,oEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,sCAAyB,CAAC,CAAC,SAAS,CAAC,oEAA+B,CAAC,CAAC;IAE3E,IAAI,CAAC,sCAAyB,CAAC,CAAC,EAAE,CAAC,oDAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/E,IAAI,CAAC,2CAA8B,CAAC,CAAC,EAAE,CAAC,8DAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACzF,IAAI,CAAC,0BAAa,CAAC,CAAC,EAAE,CAAC,oCAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAE/D,IAAI,CAAC,4DAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,sBAAe,CAAC,CAAC,SAAS,CAAC,4DAA2B,CAAC,CAAC;IAC7D,IAAI,CAAC,sCAA6B,CAAC,CAAC,SAAS,CAAC,4DAA2B,CAAC,CAAC;IAE3E,IAAI,CAAC,kCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,qCAA8B,CAAC,CAAC,SAAS,CAAC,kCAAkB,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"plugin-vscode-backend-module.js","sourceRoot":"","sources":["../../src/node/plugin-vscode-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;AAEhF,4DAA+D;AAC/D,kDAE2B;AAC3B,6EAAuE;AACvE,uFAAiF;AACjF,qDAAuD;AACvD,qFAA+E;AAC/E,+CAAuF;AACvF,yDAA6E;AAC7E,mFAA8E;AAC9E,6FAAuF;AACvF,mDAAqD;AACrD,yGAAiG;AAEjG,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,oEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,sCAAyB,CAAC,CAAC,SAAS,CAAC,oEAA+B,CAAC,CAAC;IAE3E,IAAI,CAAC,sCAAyB,CAAC,CAAC,EAAE,CAAC,oDAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/E,IAAI,CAAC,2CAA8B,CAAC,CAAC,EAAE,CAAC,8DAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACzF,IAAI,CAAC,0BAAa,CAAC,CAAC,EAAE,CAAC,oCAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAE/D,IAAI,CAAC,4DAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,sBAAe,CAAC,CAAC,SAAS,CAAC,4DAA2B,CAAC,CAAC;IAC7D,IAAI,CAAC,sCAA6B,CAAC,CAAC,SAAS,CAAC,4DAA2B,CAAC,CAAC;IAE3E,IAAI,CAAC,kCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,qCAA8B,CAAC,CAAC,SAAS,CAAC,kCAAkB,CAAC,CAAC;IAEnE,IAAI,CAAC,mCAAsB,CAAC,CAAC,EAAE,CAAC,8EAAmC,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC5F,CAAC,CAAC,CAAC"}

package/lib/node/plugin-vscode-file-handler.d.ts

@@ -1,15 +1,12 @@
 import { PluginDeployerFileHandler, PluginDeployerEntry, PluginDeployerFileHandlerContext } from '@theia/plugin-ext';
 import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';
+export declare const isVSCodePluginFile: (pluginPath?: string | undefined) => boolean;
 export declare class PluginVsCodeFileHandler implements PluginDeployerFileHandler {
     protected readonly environment: PluginVSCodeEnvironment;
     private readonly systemExtensionsDirUri;
     accept(resolvedPlugin: PluginDeployerEntry): boolean;
     handle(context: PluginDeployerFileHandlerContext): Promise<void>;
     protected getExtensionDir(context: PluginDeployerFileHandlerContext): Promise<string>;
-    /**
-     * Ensures that a user-installed plugin file is transferred to the user extension folder.
-     */
-    protected ensureDiscoverability(context: PluginDeployerFileHandlerContext): Promise<void>;
     protected decompress(extensionDir: string, context: PluginDeployerFileHandlerContext): Promise<void>;
 }
 //# sourceMappingURL=plugin-vscode-file-handler.d.ts.map

package/lib/node/plugin-vscode-file-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-vscode-file-handler.d.ts","sourceRoot":"","sources":["../../src/node/plugin-vscode-file-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,gCAAgC,EAAc,MAAM,mBAAmB,CAAC;AAMjI,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAI9E,qBACa,uBAAwB,YAAW,yBAAyB;IAGrE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC;IAExD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAiD;IAExF,MAAM,CAAC,cAAc,EAAE,mBAAmB,GAAG,OAAO;IAQ9C,MAAM,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;cAetD,eAAe,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3F;;OAEG;cACa,qBAAqB,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;cAoB/E,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;CAW7G"}
+{"version":3,"file":"plugin-vscode-file-handler.d.ts","sourceRoot":"","sources":["../../src/node/plugin-vscode-file-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,gCAAgC,EAAc,MAAM,mBAAmB,CAAC;AAMjI,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,eAAO,MAAM,kBAAkB,8CAAgH,CAAC;AAEhJ,qBACa,uBAAwB,YAAW,yBAAyB;IAGrE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC;IAExD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAiD;IAExF,MAAM,CAAC,cAAc,EAAE,mBAAmB,GAAG,OAAO;IAO9C,MAAM,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;cActD,eAAe,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,MAAM,CAAC;cAI3E,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;CAW7G"}

package/lib/node/plugin-vscode-file-handler.js

@@ -24,7 +24,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginVsCodeFileHandler = void 0;
+exports.PluginVsCodeFileHandler = exports.isVSCodePluginFile = void 0;
 const plugin_ext_1 = require("@theia/plugin-ext");
 const fs = require("@theia/core/shared/fs-extra");
 const path = require("path");
@@ -33,7 +33,8 @@ const inversify_1 = require("@theia/core/shared/inversify");
 const temp_dir_util_1 = require("@theia/plugin-ext/lib/main/node/temp-dir-util");
 const plugin_vscode_environment_1 = require("../common/plugin-vscode-environment");
 const file_uri_1 = require("@theia/core/lib/node/file-uri");
-const uri_1 = require("@theia/core/lib/common/uri");
+const isVSCodePluginFile = (pluginPath) => Boolean(pluginPath && (pluginPath.endsWith('.vsix') || pluginPath.endsWith('.tgz')));
+exports.isVSCodePluginFile = isVSCodePluginFile;
 let PluginVsCodeFileHandler = class PluginVsCodeFileHandler {
     constructor() {
         this.systemExtensionsDirUri = file_uri_1.FileUri.create((0, temp_dir_util_1.getTempDir)('vscode-unpacked'));
@@ -42,11 +43,9 @@ let PluginVsCodeFileHandler = class PluginVsCodeFileHandler {
         if (!resolvedPlugin.isFile()) {
             return false;
         }
-        const pluginPath = resolvedPlugin.path();
-        return !!pluginPath && pluginPath.endsWith('.vsix') || pluginPath.endsWith('.tgz');
+        return (0, exports.isVSCodePluginFile)(resolvedPlugin.path());
     }
     async handle(context) {
-        await this.ensureDiscoverability(context);
         const id = context.pluginEntry().id();
         const extensionDir = await this.getExtensionDir(context);
         console.log(`[${id}]: trying to decompress into "${extensionDir}"...`);
@@ -62,29 +61,6 @@ let PluginVsCodeFileHandler = class PluginVsCodeFileHandler {
     async getExtensionDir(context) {
         return file_uri_1.FileUri.fsPath(this.systemExtensionsDirUri.resolve(filenamify(context.pluginEntry().id(), { replacement: '_' })));
     }
-    /**
-     * Ensures that a user-installed plugin file is transferred to the user extension folder.
-     */
-    async ensureDiscoverability(context) {
-        if (context.pluginEntry().type === plugin_ext_1.PluginType.User) {
-            const userExtensionsDir = await this.environment.getExtensionsDirUri();
-            const currentPath = context.pluginEntry().path();
-            if (!userExtensionsDir.isEqualOrParent(new uri_1.default(currentPath)) && !userExtensionsDir.isEqualOrParent(new uri_1.default(context.pluginEntry().originalPath()))) {
-                try {
-                    const newPath = file_uri_1.FileUri.fsPath(userExtensionsDir.resolve(path.basename(currentPath)));
-                    await fs.mkdirp(file_uri_1.FileUri.fsPath(userExtensionsDir));
-                    await new Promise((resolve, reject) => {
-                        fs.copyFile(currentPath, newPath, error => error ? reject(error) : resolve());
-                    });
-                    context.pluginEntry().updatePath(newPath);
-                    context.pluginEntry().storeValue('sourceLocations', [newPath]);
-                }
-                catch (e) {
-                    console.error(`[${context.pluginEntry().id}]: Failed to copy to user directory. Future sessions may not have access to this plugin.`);
-                }
-            }
-        }
-    }
     async decompress(extensionDir, context) {
         await context.unzip(context.pluginEntry().path(), extensionDir);
         if (context.pluginEntry().path().endsWith('.tgz')) {

package/lib/node/plugin-vscode-file-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-vscode-file-handler.js","sourceRoot":"","sources":["../../src/node/plugin-vscode-file-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-vscode-file-handler.js","sourceRoot":"","sources":["../../src/node/plugin-vscode-file-handler.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,kDAAiI;AACjI,kDAAkD;AAClD,6BAA6B;AAC7B,yCAAyC;AACzC,4DAAkE;AAClE,iFAA2E;AAC3E,mFAA8E;AAC9E,4DAAwD;AAEjD,MAAM,kBAAkB,GAAG,CAAC,UAAmB,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAAnI,QAAA,kBAAkB,sBAAiH;AAGhJ,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAApC;QAKqB,2BAAsB,GAAG,kBAAO,CAAC,MAAM,CAAC,IAAA,0BAAU,EAAC,iBAAiB,CAAC,CAAC,CAAC;IAsC5F,CAAC;IApCG,MAAM,CAAC,cAAmC;QACtC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE;YAC1B,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAA,0BAAkB,EAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAyC;QAClD,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,iCAAiC,YAAY,MAAM,CAAC,CAAC;QACvE,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,KAAK,uBAAU,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACrF,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YACtC,OAAO,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAC/C,OAAO;SACV;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACrC,OAAO,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACnD,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAyC;QACrE,OAAO,kBAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7H,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,YAAoB,EAAE,OAAyC;QACtF,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,YAAY,CAAC,CAAC;QAChE,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YACzD,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;YAClF,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE;gBAC5C,MAAM,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;aACxF;SACJ;IACL,CAAC;CAEJ,CAAA;AAxCG;IADC,IAAA,kBAAM,EAAC,mDAAuB,CAAC;8BACA,mDAAuB;4DAAC;AAH/C,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA2CnC;AA3CY,0DAAuB"}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@theia/plugin-ext-vscode",
-  "version": "1.28.0-next.39+92084ae000f",
+  "version": "1.28.0-next.45+cf1b71e1aa3",
   "description": "Theia - Plugin Extension for VsCode",
   "dependencies": {
-    "@theia/callhierarchy": "1.28.0-next.39+92084ae000f",
-    "@theia/core": "1.28.0-next.39+92084ae000f",
-    "@theia/editor": "1.28.0-next.39+92084ae000f",
-    "@theia/filesystem": "1.28.0-next.39+92084ae000f",
-    "@theia/monaco": "1.28.0-next.39+92084ae000f",
+    "@theia/callhierarchy": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/core": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/editor": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/filesystem": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/monaco": "1.28.0-next.45+cf1b71e1aa3",
     "@theia/monaco-editor-core": "1.67.2",
-    "@theia/navigator": "1.28.0-next.39+92084ae000f",
-    "@theia/plugin": "1.28.0-next.39+92084ae000f",
-    "@theia/plugin-ext": "1.28.0-next.39+92084ae000f",
-    "@theia/terminal": "1.28.0-next.39+92084ae000f",
-    "@theia/userstorage": "1.28.0-next.39+92084ae000f",
-    "@theia/workspace": "1.28.0-next.39+92084ae000f",
+    "@theia/navigator": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/plugin": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/plugin-ext": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/terminal": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/userstorage": "1.28.0-next.45+cf1b71e1aa3",
+    "@theia/workspace": "1.28.0-next.45+cf1b71e1aa3",
     "@types/request": "^2.0.3",
     "filenamify": "^4.1.0",
     "request": "^2.82.0"
@@ -58,5 +58,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "92084ae000fa31f4002f130716fce43fa134f2e1"
+  "gitHead": "cf1b71e1aa3d01577f3da851fcdee3cb60c57a06"
 }

package/src/node/local-vsix-file-plugin-deployer-resolver.ts

@@ -0,0 +1,65 @@
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as fs from '@theia/core/shared/fs-extra';
+import * as path from 'path';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { FileUri } from '@theia/core/lib/node';
+import { PluginDeployerResolverContext } from '@theia/plugin-ext';
+import { LocalPluginDeployerResolver } from '@theia/plugin-ext/lib/main/node/resolvers/local-plugin-deployer-resolver';
+import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';
+import { isVSCodePluginFile } from './plugin-vscode-file-handler';
+
+@injectable()
+export class LocalVSIXFilePluginDeployerResolver extends LocalPluginDeployerResolver {
+    static LOCAL_FILE = 'local-file';
+
+    @inject(PluginVSCodeEnvironment) protected readonly environment: PluginVSCodeEnvironment;
+
+    protected get supportedScheme(): string {
+        return LocalVSIXFilePluginDeployerResolver.LOCAL_FILE;
+    }
+
+    override accept(pluginId: string): boolean {
+        return super.accept(pluginId) && isVSCodePluginFile(pluginId);
+    }
+
+    async resolveFromLocalPath(pluginResolverContext: PluginDeployerResolverContext, localPath: string): Promise<void> {
+        const fileName = path.basename(localPath);
+        const pathInUserExtensionsDirectory = await this.ensureDiscoverability(localPath);
+        pluginResolverContext.addPlugin(fileName, pathInUserExtensionsDirectory);
+    }
+
+    /**
+     * Ensures that a user-installed plugin file is transferred to the user extension folder.
+     */
+    protected async ensureDiscoverability(localPath: string): Promise<string> {
+        const userExtensionsDir = await this.environment.getExtensionsDirUri();
+        if (!userExtensionsDir.isEqualOrParent(FileUri.create(localPath))) {
+            try {
+                const newPath = FileUri.fsPath(userExtensionsDir.resolve(path.basename(localPath)));
+                await fs.mkdirp(FileUri.fsPath(userExtensionsDir));
+                await new Promise<void>((resolve, reject) => {
+                    fs.copyFile(localPath, newPath, error => error ? reject(error) : resolve());
+                });
+                return newPath;
+            } catch (e) {
+                console.warn(`Problem copying plugin at ${localPath}:`, e);
+            }
+        }
+        return localPath;
+    }
+}

package/src/node/plugin-vscode-backend-module.ts

@@ -16,7 +16,7 @@
 
 import { ContainerModule } from '@theia/core/shared/inversify';
 import {
-    PluginDeployerFileHandler, PluginDeployerDirectoryHandler, PluginScanner, PluginDeployerParticipant
+    PluginDeployerFileHandler, PluginDeployerDirectoryHandler, PluginScanner, PluginDeployerParticipant, PluginDeployerResolver
 } from '@theia/plugin-ext';
 import { PluginVsCodeFileHandler } from './plugin-vscode-file-handler';
 import { PluginVsCodeDirectoryHandler } from './plugin-vscode-directory-handler';
@@ -27,6 +27,7 @@ import { PluginHostEnvironmentVariable } from '@theia/plugin-ext/lib/common';
 import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';
 import { PluginVSCodeDeployerParticipant } from './plugin-vscode-deployer-participant';
 import { HostedPluginReader } from './plugin-reader';
+import { LocalVSIXFilePluginDeployerResolver } from './local-vsix-file-plugin-deployer-resolver';
 
 export default new ContainerModule(bind => {
     bind(PluginVSCodeEnvironment).toSelf().inSingletonScope();
@@ -44,4 +45,6 @@ export default new ContainerModule(bind => {
 
     bind(HostedPluginReader).toSelf().inSingletonScope();
     bind(BackendApplicationContribution).toService(HostedPluginReader);
+
+    bind(PluginDeployerResolver).to(LocalVSIXFilePluginDeployerResolver).inSingletonScope();
 });

package/src/node/plugin-vscode-file-handler.ts

@@ -22,7 +22,8 @@ import { injectable, inject } from '@theia/core/shared/inversify';
 import { getTempDir } from '@theia/plugin-ext/lib/main/node/temp-dir-util';
 import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';
 import { FileUri } from '@theia/core/lib/node/file-uri';
-import URI from '@theia/core/lib/common/uri';
+
+export const isVSCodePluginFile = (pluginPath?: string) => Boolean(pluginPath && (pluginPath.endsWith('.vsix') || pluginPath.endsWith('.tgz')));
 
 @injectable()
 export class PluginVsCodeFileHandler implements PluginDeployerFileHandler {
@@ -36,12 +37,10 @@ export class PluginVsCodeFileHandler implements PluginDeployerFileHandler {
         if (!resolvedPlugin.isFile()) {
             return false;
         }
-        const pluginPath = resolvedPlugin.path();
-        return !!pluginPath && pluginPath.endsWith('.vsix') || pluginPath.endsWith('.tgz');
+        return isVSCodePluginFile(resolvedPlugin.path());
     }
 
     async handle(context: PluginDeployerFileHandlerContext): Promise<void> {
-        await this.ensureDiscoverability(context);
         const id = context.pluginEntry().id();
         const extensionDir = await this.getExtensionDir(context);
         console.log(`[${id}]: trying to decompress into "${extensionDir}"...`);
@@ -59,29 +58,6 @@ export class PluginVsCodeFileHandler implements PluginDeployerFileHandler {
         return FileUri.fsPath(this.systemExtensionsDirUri.resolve(filenamify(context.pluginEntry().id(), { replacement: '_' })));
     }
 
-    /**
-     * Ensures that a user-installed plugin file is transferred to the user extension folder.
-     */
-    protected async ensureDiscoverability(context: PluginDeployerFileHandlerContext): Promise<void> {
-        if (context.pluginEntry().type === PluginType.User) {
-            const userExtensionsDir = await this.environment.getExtensionsDirUri();
-            const currentPath = context.pluginEntry().path();
-            if (!userExtensionsDir.isEqualOrParent(new URI(currentPath)) && !userExtensionsDir.isEqualOrParent(new URI(context.pluginEntry().originalPath()))) {
-                try {
-                    const newPath = FileUri.fsPath(userExtensionsDir.resolve(path.basename(currentPath)));
-                    await fs.mkdirp(FileUri.fsPath(userExtensionsDir));
-                    await new Promise<void>((resolve, reject) => {
-                        fs.copyFile(currentPath, newPath, error => error ? reject(error) : resolve());
-                    });
-                    context.pluginEntry().updatePath(newPath);
-                    context.pluginEntry().storeValue('sourceLocations', [newPath]);
-                } catch (e) {
-                    console.error(`[${context.pluginEntry().id}]: Failed to copy to user directory. Future sessions may not have access to this plugin.`);
-                }
-            }
-        }
-    }
-
     protected async decompress(extensionDir: string, context: PluginDeployerFileHandlerContext): Promise<void> {
         await context.unzip(context.pluginEntry().path(), extensionDir);
         if (context.pluginEntry().path().endsWith('.tgz')) {