From 256d0cd95feda81514ae18a16f396ee73dcfb280 Mon Sep 17 00:00:00 2001 From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com> Date: Thu, 11 Feb 2021 15:16:20 -0800 Subject: [PATCH] Update codespaces check to also include VS Code remoting codespaces (#6952) --- Extension/src/LanguageServer/extension.ts | 4 ++-- Extension/src/common.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index 2f45fd552c..8e862c4190 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -608,8 +608,8 @@ async function suggestInsidersChannel(): Promise { if (!suggestInsiders.Value) { return; } - if (vscode.env.uiKind === vscode.UIKind.Web) { - // Do not prompt users of Web-based Codespaces to join Insiders. + if (util.isCodespaces()) { + // Do not prompt users of Codespaces to join Insiders. return; } let buildInfo: BuildInfo | undefined; diff --git a/Extension/src/common.ts b/Extension/src/common.ts index 9d04bfeffb..107f82f96f 100644 --- a/Extension/src/common.ts +++ b/Extension/src/common.ts @@ -1273,3 +1273,7 @@ export function getUniqueWorkspaceName(workspaceFolder: vscode.WorkspaceFolder): export function getUniqueWorkspaceStorageName(workspaceFolder: vscode.WorkspaceFolder): string { return getUniqueWorkspaceNameHelper(workspaceFolder, true); } + +export function isCodespaces(): boolean { + return !!process.env["CODESPACES"]; +}