From 6e7bc07cdf225aea811f793c2f712f25846b8d20 Mon Sep 17 00:00:00 2001 From: David Barsky Date: Tue, 14 Mar 2023 13:36:21 -0400 Subject: [PATCH] fix: don't override `linkedProjects` if no workspace was discovered. --- editors/code/src/client.ts | 7 ++++++- editors/code/src/ctx.ts | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index 9a576570beb..565cb9c6432 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts @@ -96,7 +96,12 @@ export async function createClient( if (resp && Array.isArray(resp)) { return resp.map((val) => { return prepareVSCodeConfig(val, (key, cfg) => { - if (key === "linkedProjects") { + // we only want to set discovered workspaces on the right key + // and if a workspace has been discovered. + if ( + key === "linkedProjects" && + config.discoveredWorkspaces.length > 0 + ) { cfg[key] = config.discoveredWorkspaces; } }); diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts index ca30d239c95..ffcfb810a24 100644 --- a/editors/code/src/ctx.ts +++ b/editors/code/src/ctx.ts @@ -205,7 +205,9 @@ export class Ctx { const initializationOptions = prepareVSCodeConfig( rawInitializationOptions, (key, obj) => { - if (key === "linkedProjects") { + // we only want to set discovered workspaces on the right key + // and if a workspace has been discovered. + if (key === "linkedProjects" && this.config.discoveredWorkspaces.length > 0) { obj["linkedProjects"] = this.config.discoveredWorkspaces; } }