fix scope when falling back to original load function

jrieken · jrieken · commit c8d44e24dd25 · 2019-08-19T14:20:26.000+02:00
diff --git a/src/vs/workbench/api/common/extHostRequireInterceptor.ts b/src/vs/workbench/api/common/extHostRequireInterceptor.ts
@@ -21,12 +21,12 @@ import { platform } from 'vs/base/common/process';
 
 
 interface LoadFunction {
-	(request: string, parent: { filename: string; }, isMain: any): any;
+	(request: string): any;
 }
 
 interface INodeModuleFactory {
 	readonly nodeModuleName: string | string[];
-	load(request: string, parent: URI, isMain: any, original: LoadFunction): any;
+	load(request: string, parent: URI, original: LoadFunction): any;
 	alternativeModuleName?(name: string): string | undefined;
 }
 
@@ -245,15 +245,15 @@ class OpenNodeModuleFactory implements INodeModuleFactory {
 		};
 	}
 
-	public load(request: string, parent: URI, isMain: any, original: LoadFunction): any {
+	public load(request: string, parent: URI, original: LoadFunction): any {
 		// get extension id from filename and api for extension
 		const extension = this._extensionPaths.findSubstr(parent.fsPath);
 		if (extension) {
 			this._extensionId = extension.identifier.value;
 			this.sendShimmingTelemetry();
 		}
 
-		this._original = original(request, { filename: parent.fsPath }, isMain);
+		this._original = original(request);
 		return this._impl;
 	}
 
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -31,7 +31,11 @@ class NodeModuleRequireInterceptor extends RequireInterceptor {
 			if (!that._factories.has(request)) {
 				return original.apply(this, arguments);
 			}
-			return that._factories.get(request)!.load(request, URI.file(parent.filename), isMain, original);
+			return that._factories.get(request)!.load(
+				request,
+				URI.file(parent.filename),
+				request => original.apply(this, [request, parent, isMain])
+			);
 		};
 	}
 }
diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
@@ -89,7 +89,7 @@ class WorkerRequireInterceptor extends RequireInterceptor {
 		}
 
 		if (this._factories.has(request)) {
-			return this._factories.get(request)!.load(request, parent, false, () => { throw new Error(); });
+			return this._factories.get(request)!.load(request, parent, () => { throw new Error('CANNOT LOAD MODULE from here.'); });
 		}
 		return undefined;
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ import { platform } from 'vs/base/common/process';`
`21`	`21`
`22`	`22`
`23`	`23`	`interface LoadFunction {`
`24`		`- (request: string, parent: { filename: string; }, isMain: any): any;`
	`24`	`+ (request: string): any;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`interface INodeModuleFactory {`
`28`	`28`	`readonly nodeModuleName: string \| string[];`
`29`		`- load(request: string, parent: URI, isMain: any, original: LoadFunction): any;`
	`29`	`+ load(request: string, parent: URI, original: LoadFunction): any;`
`30`	`30`	`alternativeModuleName?(name: string): string \| undefined;`
`31`	`31`	`}`
`32`	`32`
`@@ -245,15 +245,15 @@ class OpenNodeModuleFactory implements INodeModuleFactory {`
`245`	`245`	`};`
`246`	`246`	`}`
`247`	`247`
`248`		`- public load(request: string, parent: URI, isMain: any, original: LoadFunction): any {`
	`248`	`+ public load(request: string, parent: URI, original: LoadFunction): any {`
`249`	`249`	`// get extension id from filename and api for extension`
`250`	`250`	`const extension = this._extensionPaths.findSubstr(parent.fsPath);`
`251`	`251`	`if (extension) {`
`252`	`252`	`this._extensionId = extension.identifier.value;`
`253`	`253`	`this.sendShimmingTelemetry();`
`254`	`254`	`}`
`255`	`255`
`256`		`- this._original = original(request, { filename: parent.fsPath }, isMain);`
	`256`	`+ this._original = original(request);`
`257`	`257`	`return this._impl;`
`258`	`258`	`}`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,11 @@ class NodeModuleRequireInterceptor extends RequireInterceptor {`
`31`	`31`	`if (!that._factories.has(request)) {`
`32`	`32`	`return original.apply(this, arguments);`
`33`	`33`	`}`
`34`		`- return that._factories.get(request)!.load(request, URI.file(parent.filename), isMain, original);`
	`34`	`+ return that._factories.get(request)!.load(`
	`35`	`+ request,`
	`36`	`+ URI.file(parent.filename),`
	`37`	`+ request => original.apply(this, [request, parent, isMain])`
	`38`	`+ );`
`35`	`39`	`};`
`36`	`40`	`}`
`37`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ class WorkerRequireInterceptor extends RequireInterceptor {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (this._factories.has(request)) {`
`92`		`- return this._factories.get(request)!.load(request, parent, false, () => { throw new Error(); });`
	`92`	`+ return this._factories.get(request)!.load(request, parent, () => { throw new Error('CANNOT LOAD MODULE from here.'); });`
`93`	`93`	`}`
`94`	`94`	`return undefined;`
`95`	`95`	`}`