From 163aed3817c0ae3829ec79ec765cb18e73333a7e Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 15 Aug 2019 12:06:48 +0200
Subject: [PATCH] fix exports trap

---
 .../api/worker/extHostExtensionService.ts       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
index 0b49644e7cc..ada9786cd0f 100644
--- a/src/vs/workbench/api/worker/extHostExtensionService.ts
+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts
@@ -82,36 +82,35 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 				throw new Error(`Cannot load module '${mod}'`);
 			}
 
-			const exports = Object.create(null);
-			patchSelf.module = { exports };
-			patchSelf.exports = exports;
+			const moduleExportsTrap = { exports: Object.create(null) };
+			patchSelf.module = moduleExportsTrap;
+			patchSelf.exports = moduleExportsTrap.exports;
 
 			const next = joinPath(parent, '..', ensureSuffix(mod, '.js'));
 			moduleStack.push(next);
 			importScripts(asDomUri(next).toString(true));
 			moduleStack.pop();
 
-			return exports;
+			return moduleExportsTrap.exports;
 		};
 
 		try {
 			activationTimesBuilder.codeLoadingStart();
 
-			const exports = Object.create(null);
-			patchSelf.module = { exports };
-			patchSelf.exports = exports;
+			const moduleExportsTrap = { exports: Object.create(null) };
+			patchSelf.module = moduleExportsTrap;
+			patchSelf.exports = moduleExportsTrap.exports;
 
 			module = module.with({ path: ensureSuffix(module.path, '.js') });
 			moduleStack.push(module);
 
 			importScripts(asDomUri(module).toString(true));
 			moduleStack.pop();
+			return Promise.resolve<T>(moduleExportsTrap.exports);
 
 		} finally {
 			activationTimesBuilder.codeLoadingStop();
 		}
-
-		return Promise.resolve<T>(exports);
 	}
 
 	async $setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void> {