From dc5c271a0c91389ec0f64d29138bed616812b8a0 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 11 Mar 2021 10:56:16 -0700 Subject: [PATCH] fix(lib/vscode): replace doStore with getSotrage Inside the class BrowserStorageService, it looks like they replaced doStore with getStorage. However, at the time of writing this message, I am getting a TypeScript error saying: > Non-abstract class 'BrowserStorageService' does not implement inherited > abstract member 'doStore' from class 'AbstractStorageService'. Hopefully that will be disappear after I fix other errors. --- lib/vscode/src/vs/platform/storage/browser/storageService.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/vscode/src/vs/platform/storage/browser/storageService.ts b/lib/vscode/src/vs/platform/storage/browser/storageService.ts index 841f5ae4..5cfb8996 100644 --- a/lib/vscode/src/vs/platform/storage/browser/storageService.ts +++ b/lib/vscode/src/vs/platform/storage/browser/storageService.ts @@ -82,13 +82,8 @@ export class BrowserStorageService extends AbstractStorageService { } } -<<<<<<< HEAD - protected doStore(key: string, value: string | boolean | number | undefined | null, scope: StorageScope): Promise { - return this.getStorage(scope).set(key, value); -======= protected getStorage(scope: StorageScope): IStorage | undefined { return scope === StorageScope.GLOBAL ? this.globalStorage : this.workspaceStorage; ->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384 } protected getLogDetails(scope: StorageScope): string | undefined {