Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

debt - IExtensionDescription#main should be relative like all other file references

Browse Source
This commit is contained in:
Johannes Rieken
2019-08-14 16:02:01 +02:00
parent 361dbb9faf
commit 8f3b7dec4a
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/worker/extHostExtensionService.ts
View File

@@ -54,11 +54,11 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
this._apiInstances = new ApiInstances(apiFactory, extensionPath, this._registry, configProvider);
}
protected _loadCommonJSModule<T>(modulePath: string, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
protected _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
// make sure modulePath ends with `.js`
const suffix = '.js';
modulePath = endsWith(modulePath, suffix) ? modulePath : modulePath + suffix;
let modulePath = endsWith(module.fsPath, suffix) ? module.fsPath : module.fsPath + suffix;
interface FakeCommonJSSelf {
module?: object;
@@ -71,9 +71,9 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
// FAKE commonjs world that only collects exports
const patchSelf: FakeCommonJSSelf = <any>self;
const module = { exports: {} };
patchSelf.module = module;
patchSelf.exports = module.exports;
const exports = Object.create(null);
patchSelf.module = { exports };
patchSelf.exports = exports;
patchSelf.window = self; // <- that's improper but might help extensions that aren't authored correctly
// FAKE require function that only works for the vscode-module
@@ -97,7 +97,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
activationTimesBuilder.codeLoadingStop();
}
return Promise.resolve(module.exports as T);
return Promise.resolve<T>(exports);
}
async $setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void> {