Skip to content

Commit d6b1d0c

Browse files
authored
Merge pull request #1671 from cdr/pin-vscode
Pin to vscode 1.45.1
2 parents eccee53 + ce9d14d commit d6b1d0c

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

ci/dev/vscode.patch

+9-9
Original file line numberDiff line numberDiff line change
@@ -3083,23 +3083,23 @@ index afdd6bf398..1633daf93d 100644
30833083
return storagePath;
30843084

30853085
diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
3086-
index 10a21537a4..5dcbba0913 100644
3086+
index 4781f22676..86c9246f51 100644
30873087
--- a/src/vs/workbench/api/worker/extHostExtensionService.ts
30883088
+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts
3089-
@@ -8,6 +8,9 @@ import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHost
3090-
import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
3089+
@@ -9,6 +9,9 @@ import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHost
3090+
import { endsWith } from 'vs/base/common/strings';
30913091
import { URI } from 'vs/base/common/uri';
30923092
import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
30933093
+import { joinPath } from 'vs/base/common/resources';
30943094
+import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
30953095
+import { loadCommonJSModule } from 'vs/server/browser/worker';
3096-
3096+
30973097
class WorkerRequireInterceptor extends RequireInterceptor {
3098-
3099-
@@ -40,7 +43,14 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
3098+
3099+
@@ -41,7 +44,14 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
31003100
await this._fakeModules.install();
31013101
}
3102-
3102+
31033103
- protected async _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
31043104
+ protected async _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
31053105
+ if (!URI.isUri(module) && module.extensionKind !== 'web') {
@@ -3109,10 +3109,10 @@ index 10a21537a4..5dcbba0913 100644
31093109
+ if (!URI.isUri(module)) {
31103110
+ module = joinPath(module.extensionLocation, module.main!);
31113111
+ }
3112-
3112+
31133113
module = module.with({ path: ensureSuffix(module.path, '.js') });
31143114
const response = await fetch(module.toString(true));
3115-
@@ -56,7 +66,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
3115+
@@ -57,7 +67,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
31163116
const _exports = {};
31173117
const _module = { exports: _exports };
31183118
const _require = (request: string) => {

lib/vscode

Submodule vscode updated 229 files

0 commit comments

Comments
 (0)