From 7c1f1ea20c7d4a7aca514933fc4ce383ba993415 Mon Sep 17 00:00:00 2001 From: yonip23 <67855609+yonip23@users.noreply.github.com> Date: Sun, 3 Dec 2023 16:32:08 +0200 Subject: [PATCH] DEV2-4342 fix tabnine.enterprise key (#1390) --- src/enterprise/extension.ts | 12 +++++++----- src/globals/consts.ts | 2 +- src/tabnineChatWidget/ChatApi.ts | 7 +++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/enterprise/extension.ts b/src/enterprise/extension.ts index 7e94c13d23..c56249b752 100644 --- a/src/enterprise/extension.ts +++ b/src/enterprise/extension.ts @@ -34,7 +34,7 @@ import TabnineAuthenticationProvider from "../authentication/TabnineAuthenticati import { BRAND_NAME, ENTERPRISE_BRAND_NAME, - TABNINE_ENTERPRISE_KEY, + IS_SELF_HOSTED_CONTEXT_KEY, } from "../globals/consts"; import { StatusBar } from "./statusBar"; import { isHealthyServer } from "./update/isHealthyServer"; @@ -46,6 +46,8 @@ import SignInUsingCustomTokenCommand from "../authentication/loginWithCustomToke import { SIGN_IN_AUTH_TOKEN_COMMAND } from "../commandsHandler"; import { WorkspaceUpdater } from "../WorkspaceUpdater"; +const TABNINE_ENTERPISE_CONTEXT_KEY = "tabnine.enterprise"; + export async function activate( context: vscode.ExtensionContext ): Promise { @@ -119,16 +121,16 @@ async function setEnterpriseContext( ): Promise { await vscode.commands.executeCommand( "setContext", - TABNINE_ENTERPRISE_KEY, + TABNINE_ENTERPISE_CONTEXT_KEY, true ); - await context.workspaceState.update(TABNINE_ENTERPRISE_KEY, true); + await context.workspaceState.update(IS_SELF_HOSTED_CONTEXT_KEY, true); return new vscode.Disposable(() => { - void context.workspaceState.update(TABNINE_ENTERPRISE_KEY, undefined); + void context.workspaceState.update(IS_SELF_HOSTED_CONTEXT_KEY, undefined); void vscode.commands.executeCommand( "setContext", - TABNINE_ENTERPRISE_KEY, + TABNINE_ENTERPISE_CONTEXT_KEY, undefined ); }); diff --git a/src/globals/consts.ts b/src/globals/consts.ts index de8e9bae0e..1b7046b38d 100644 --- a/src/globals/consts.ts +++ b/src/globals/consts.ts @@ -178,4 +178,4 @@ export enum SuggestionTrigger { } export const TLS_CONFIG_MIN_SUPPORTED_VERSION = "4.22.0"; -export const TABNINE_ENTERPRISE_KEY = "tabnine.enterprise"; +export const IS_SELF_HOSTED_CONTEXT_KEY = "tabnine.isSelfHosted"; diff --git a/src/tabnineChatWidget/ChatApi.ts b/src/tabnineChatWidget/ChatApi.ts index 8cbc9bf8f6..21ae6e4b8f 100644 --- a/src/tabnineChatWidget/ChatApi.ts +++ b/src/tabnineChatWidget/ChatApi.ts @@ -15,7 +15,7 @@ import { peekDefinition } from "./handlers/peekDefinition"; import { ServiceLevel } from "../binary/state"; import { GET_CHAT_STATE_COMMAND, - TABNINE_ENTERPRISE_KEY, + IS_SELF_HOSTED_CONTEXT_KEY, } from "../globals/consts"; import { BasicContext, @@ -122,7 +122,10 @@ export function initChatApi( ].includes(vscode.window.activeColorTheme.kind), isTelemetryEnabled: isCapabilityEnabled(Capability.ALPHA_CAPABILITY), serverUrl, - isSelfHosted: context.workspaceState.get(TABNINE_ENTERPRISE_KEY, false), + isSelfHosted: context.workspaceState.get( + IS_SELF_HOSTED_CONTEXT_KEY, + false + ), }); }) .registerEvent("get_user", async () => {