Skip to content

Commit daf204e

Browse files
committed
Exclude browser-supported remote extensions
Removing them just for peace of mind even though they seem to get filtered out later. This line is meant to only add remote extensions that aren't capable of running in the browser. If they are browser-capable they don't need to run in our shimmed Node environment.
1 parent f20f7ac commit daf204e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

ci/dev/vscode.patch

+4-5
Original file line numberDiff line numberDiff line change
@@ -929,11 +929,10 @@ index 0000000000000000000000000000000000000000..3c0703b7174ad792a4b42841e96ee937
929929
+};
930930
diff --git a/src/vs/server/browser/extHostNodeProxy.ts b/src/vs/server/browser/extHostNodeProxy.ts
931931
new file mode 100644
932-
index 0000000000000000000000000000000000000000..6c6b87a05610417d73635c5a151845000f216d28
932+
index 0000000000000000000000000000000000000000..5dd5406befcb593ad6366d9e98f46485ed14fbc0
933933
--- /dev/null
934934
+++ b/src/vs/server/browser/extHostNodeProxy.ts
935-
@@ -0,0 +1,52 @@
936-
+import { VSBuffer } from 'vs/base/common/buffer';
935+
@@ -0,0 +1,51 @@
937936
+import { Emitter } from 'vs/base/common/event';
938937
+import { UriComponents } from 'vs/base/common/uri';
939938
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -3282,7 +3281,7 @@ index a982b3ecc58c5a2f3a92be7b8cca3a1cacbb7d47..97f9bfcf0e679be683b1b09cd569149e
32823281
const error = new Error(localize('cannot be installed', "Cannot install '{0}' because this extension has defined that it cannot run on the remote server.", gallery.displayName || gallery.name));
32833282
error.name = INSTALL_ERROR_NOT_SUPPORTED;
32843283
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
3285-
index 5eaec3499a3bd87ee4026c26a4b0e8c706978859..ee6801e5ddab91910930685c326aa6e344dd8d5d 100644
3284+
index 5eaec3499a3bd87ee4026c26a4b0e8c706978859..829514442fe60e2999378af14fd38c71ee92d2b9 100644
32863285
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
32873286
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
32883287
@@ -161,8 +161,10 @@ export class ExtensionService extends AbstractExtensionService implements IExten
@@ -3293,7 +3292,7 @@ index 5eaec3499a3bd87ee4026c26a4b0e8c706978859..ee6801e5ddab91910930685c326aa6e3
32933292
remoteExtensions = this._checkEnabledAndProposedAPI(remoteExtensions);
32943293
+ // NOTE@coder: Include remotely hosted extensions that should run locally.
32953294
+ localExtensions = this._checkEnabledAndProposedAPI(localExtensions)
3296-
+ .concat(remoteExtensions.filter(ext => ext.extensionKind && (ext.extensionKind === "web" || ext.extensionKind.includes("web"))));
3295+
+ .concat(remoteExtensions.filter(ext => !ext.browser && ext.extensionKind && (ext.extensionKind === "web" || ext.extensionKind.includes("web"))));
32973296

32983297
const remoteAgentConnection = this._remoteAgentService.getConnection();
32993298
this._runningLocation = this._runningLocationClassifier.determineRunningLocation(localExtensions, remoteExtensions);

0 commit comments

Comments
 (0)