Loading src/common/language_server/language_client_wrapper.test.ts +3 −0 Original line number Diff line number Diff line Loading @@ -68,6 +68,9 @@ describe('LanguageClientWrapper', () => { featureFlags: { codeSuggestionsClientDirectToGateway: false, }, suggestionsCache: { enabled: false, }, }, }, ); Loading src/common/language_server/language_client_wrapper.ts +6 −1 Original line number Diff line number Diff line Loading @@ -11,11 +11,15 @@ import { BaseLanguageClient, DidChangeConfigurationNotification } from 'vscode-l import { GitLabPlatformManager } from '../platform/gitlab_platform'; import { GitLabPlatformManagerForCodeSuggestions } from '../code_suggestions/gitlab_platform_manager_for_code_suggestions'; import { CodeSuggestionsStateManager } from '../code_suggestions/code_suggestions_state_manager'; import { getAiAssistedCodeSuggestionsConfiguration } from '../utils/extension_configuration'; import { log } from '../log'; import { FeatureFlag, isEnabled } from '../feature_flags'; // note: Temporary until new gitlab-lsp version bumps with IConfig updated type LspConfig = IConfig | { featureFlags: Record<string, boolean> }; type LspConfig = | IConfig | { featureFlags: Record<string, boolean> } | { suggestionsCache?: { enabled?: boolean } }; export class LanguageClientWrapper { #client: BaseLanguageClient; Loading Loading @@ -79,6 +83,7 @@ export class LanguageClientWrapper { FeatureFlag.CodeSuggestionsClientDirectToGateway, ), }, suggestionsCache: getAiAssistedCodeSuggestionsConfiguration().suggestionsCache, }; log.info(`Configuring Language Server - baseUrl: ${platform.account.instanceUrl}`); Loading src/common/utils/extension_configuration.ts +2 −0 Original line number Diff line number Diff line Loading @@ -20,6 +20,7 @@ export interface ExtensionConfiguration { export interface AiAssistedCodeSuggestionsConfiguration { enabled: boolean; preferredAccount?: string; suggestionsCache?: { enabled?: boolean }; } // VS Code returns a value or `null` but undefined is better for using default function arguments Loading @@ -43,6 +44,7 @@ export function getAiAssistedCodeSuggestionsConfiguration(): AiAssistedCodeSugge return { enabled: aiAssistedCodeSuggestionsConfig.enabled, preferredAccount: aiAssistedCodeSuggestionsConfig.preferredAccount, suggestionsCache: aiAssistedCodeSuggestionsConfig.suggestionsCache || { enabled: false }, }; } Loading Loading
src/common/language_server/language_client_wrapper.test.ts +3 −0 Original line number Diff line number Diff line Loading @@ -68,6 +68,9 @@ describe('LanguageClientWrapper', () => { featureFlags: { codeSuggestionsClientDirectToGateway: false, }, suggestionsCache: { enabled: false, }, }, }, ); Loading
src/common/language_server/language_client_wrapper.ts +6 −1 Original line number Diff line number Diff line Loading @@ -11,11 +11,15 @@ import { BaseLanguageClient, DidChangeConfigurationNotification } from 'vscode-l import { GitLabPlatformManager } from '../platform/gitlab_platform'; import { GitLabPlatformManagerForCodeSuggestions } from '../code_suggestions/gitlab_platform_manager_for_code_suggestions'; import { CodeSuggestionsStateManager } from '../code_suggestions/code_suggestions_state_manager'; import { getAiAssistedCodeSuggestionsConfiguration } from '../utils/extension_configuration'; import { log } from '../log'; import { FeatureFlag, isEnabled } from '../feature_flags'; // note: Temporary until new gitlab-lsp version bumps with IConfig updated type LspConfig = IConfig | { featureFlags: Record<string, boolean> }; type LspConfig = | IConfig | { featureFlags: Record<string, boolean> } | { suggestionsCache?: { enabled?: boolean } }; export class LanguageClientWrapper { #client: BaseLanguageClient; Loading Loading @@ -79,6 +83,7 @@ export class LanguageClientWrapper { FeatureFlag.CodeSuggestionsClientDirectToGateway, ), }, suggestionsCache: getAiAssistedCodeSuggestionsConfiguration().suggestionsCache, }; log.info(`Configuring Language Server - baseUrl: ${platform.account.instanceUrl}`); Loading
src/common/utils/extension_configuration.ts +2 −0 Original line number Diff line number Diff line Loading @@ -20,6 +20,7 @@ export interface ExtensionConfiguration { export interface AiAssistedCodeSuggestionsConfiguration { enabled: boolean; preferredAccount?: string; suggestionsCache?: { enabled?: boolean }; } // VS Code returns a value or `null` but undefined is better for using default function arguments Loading @@ -43,6 +44,7 @@ export function getAiAssistedCodeSuggestionsConfiguration(): AiAssistedCodeSugge return { enabled: aiAssistedCodeSuggestionsConfig.enabled, preferredAccount: aiAssistedCodeSuggestionsConfig.preferredAccount, suggestionsCache: aiAssistedCodeSuggestionsConfig.suggestionsCache || { enabled: false }, }; } Loading