From 290554f185d1b357001d0a3e9a0f404955c2f322 Mon Sep 17 00:00:00 2001 From: Josh Spicer <23246594+joshspicer@users.noreply.github.com> Date: Wed, 19 Mar 2025 15:43:20 -0700 Subject: [PATCH] move defaults for 'remote.defaultExtensionsIfInstalledLocally' to product.json (#244046) * move defaults for 'remote.defaultExtensionsIfInstalledLocally' to product.json * bump distro (https://github.com/microsoft/vscode-distro/commit/49462d855946fb8ed4466998e24eb33ee0e2bf05) --- package.json | 2 +- src/vs/base/common/product.ts | 2 ++ .../workbench/contrib/remote/common/remote.contribution.ts | 6 ++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d9f82c410bc..94aefccae36 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.99.0", - "distro": "f3960cabd77440aab984a96449bb60ebbf5ecea0", + "distro": "49462d855946fb8ed4466998e24eb33ee0e2bf05", "author": { "name": "Microsoft Corporation" }, diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts index 1b5ec3759b1..5d7d5aa000c 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -205,6 +205,8 @@ export interface IProductConfiguration { readonly chatParticipantRegistry?: string; readonly emergencyAlertUrl?: string; + + readonly remoteDefaultExtensionsIfInstalledLocally?: string[]; } export interface ITunnelApplicationConfig { diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts index f2bb13dad7f..748b1a36ee8 100644 --- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts +++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts @@ -27,6 +27,7 @@ import { IDownloadService } from '../../../../platform/download/common/download. import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js'; import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js'; import { REMOTE_DEFAULT_IF_LOCAL_EXTENSIONS } from '../../../../platform/remote/common/remote.js'; +import product from '../../../../platform/product/common/product.js'; const EXTENSION_IDENTIFIER_PATTERN = '([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$'; @@ -363,10 +364,7 @@ Registry.as(ConfigurationExtensions.Configuration) [REMOTE_DEFAULT_IF_LOCAL_EXTENSIONS]: { type: 'array', markdownDescription: localize('remote.defaultExtensionsIfInstalledLocally.markdownDescription', 'List of extensions to install automatically on all remotes if already installed locally.'), - default: [ - 'GitHub.copilot', - 'GitHub.copilot-chat' - ], + default: product?.remoteDefaultExtensionsIfInstalledLocally || [], items: { type: 'string', pattern: EXTENSION_IDENTIFIER_PATTERN,