Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/service-override/chat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ import { ChatMarkdownAnchorService } from 'vs/workbench/contrib/chat/browser/wid
import { ChatEditingService } from 'vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl'
import {
ChatEntitlementService,
ChatEntitlement
ChatEntitlement,
type IChatEntitlementContextState
} from 'vs/workbench/services/chat/common/chatEntitlementService'
import { PromptsService } from 'vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl'
import { IChatEntitlementService } from 'vs/workbench/services/chat/common/chatEntitlementService.service'
Expand Down Expand Up @@ -467,4 +468,4 @@ export default function getServiceOverride({
}
}

export { type IDefaultAccount, ChatEntitlement }
export { type IDefaultAccount, ChatEntitlement, type IChatEntitlementContextState }
45 changes: 32 additions & 13 deletions src/service-override/storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export interface DatabaseFactories {
class InjectedBrowserStorageService extends BrowserStorageService {
constructor(
private fallbackOverride: Record<string, unknown> | undefined,
private forcedValues: Record<string, unknown> | undefined,
private databaseFactories: DatabaseFactories = {},
@IUserDataProfileService userDataProfileService: IUserDataProfileService,
@ILogService logService: ILogService,
Expand All @@ -124,9 +125,12 @@ class InjectedBrowserStorageService extends BrowserStorageService {
override get(key: string, scope: StorageScope, fallbackValue: string): string
override get(key: string, scope: StorageScope): string | undefined
override get(key: string, scope: StorageScope, fallbackValue?: string): string | undefined {
return this.getStorage(scope)?.get(
key,
(this.fallbackOverride?.[key] as string | undefined) ?? fallbackValue
return (
(this.forcedValues?.[key] as string | undefined) ??
this.getStorage(scope)?.get(
key,
(this.fallbackOverride?.[key] as string | undefined) ?? fallbackValue
)
)
}

Expand All @@ -137,27 +141,36 @@ class InjectedBrowserStorageService extends BrowserStorageService {
scope: StorageScope,
fallbackValue?: boolean
): boolean | undefined {
return this.getStorage(scope)?.getBoolean(
key,
(this.fallbackOverride?.[key] as boolean | undefined) ?? fallbackValue
return (
(this.forcedValues?.[key] as boolean | undefined) ??
this.getStorage(scope)?.getBoolean(
key,
(this.fallbackOverride?.[key] as boolean | undefined) ?? fallbackValue
)
)
}

override getNumber(key: string, scope: StorageScope, fallbackValue: number): number
override getNumber(key: string, scope: StorageScope): number | undefined
override getNumber(key: string, scope: StorageScope, fallbackValue?: number): number | undefined {
return this.getStorage(scope)?.getNumber(
key,
(this.fallbackOverride?.[key] as number | undefined) ?? fallbackValue
return (
(this.forcedValues?.[key] as number | undefined) ??
this.getStorage(scope)?.getNumber(
key,
(this.fallbackOverride?.[key] as number | undefined) ?? fallbackValue
)
)
}

override getObject(key: string, scope: StorageScope, fallbackValue: object): object
override getObject(key: string, scope: StorageScope): object | undefined
override getObject(key: string, scope: StorageScope, fallbackValue?: object): object | undefined {
return this.getStorage(scope)?.getObject(
key,
(this.fallbackOverride?.[key] as object | undefined) ?? fallbackValue
return (
(this.forcedValues?.[key] as object | undefined) ??
this.getStorage(scope)?.getObject(
key,
(this.fallbackOverride?.[key] as object | undefined) ?? fallbackValue
)
)
}

Expand Down Expand Up @@ -198,6 +211,11 @@ interface StorageServiceParameters {
*/
fallbackOverride?: Record<string, unknown>

/**
* Allows to force the value of some keys
*/
forcedValues?: Record<string, unknown>

/**
* Allow to override the storage database for a specific scope (application, profile, workspace)
*/
Expand All @@ -206,12 +224,13 @@ interface StorageServiceParameters {

export default function getStorageServiceOverride({
fallbackOverride,
forcedValues,
databaseFactories
}: StorageServiceParameters = {}): IEditorOverrideServices {
return {
[IStorageService.toString()]: new SyncDescriptor(
InjectedBrowserStorageService,
[fallbackOverride, databaseFactories],
[fallbackOverride, forcedValues, databaseFactories],
true
),
[IExtensionStorageService.toString()]: new SyncDescriptor(ExtensionStorageService, [], true)
Expand Down
Loading