Skip to content

Commit e3085eb

Browse files
author
Benjamin Pasero
committed
storage => main storage (storage2)
1 parent 5278d87 commit e3085eb

10 files changed

Lines changed: 38 additions & 29 deletions

File tree

‎src/vs/code/electron-main/app.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
2626
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
2727
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
2828
import { ILogService } from 'vs/platform/log/common/log';
29-
import { IStorageService } from 'vs/platform/storage/node/storage';
29+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
3030
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
3131
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
3232
import { IURLService } from 'vs/platform/url/common/url';
@@ -74,7 +74,7 @@ export class CodeApplication {
7474
@IEnvironmentService private environmentService: IEnvironmentService,
7575
@ILifecycleService private lifecycleService: ILifecycleService,
7676
@IConfigurationService configurationService: ConfigurationService,
77-
@IStorageService private storageService: IStorageService,
77+
@IStorageMainService private storageService: IStorageMainService,
7878
@IHistoryMainService private historyService: IHistoryMainService
7979
) {
8080
this.toDispose = [mainIpcServer, configurationService];

‎src/vs/code/electron-main/keyboard.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import * as nativeKeymap from 'native-keymap';
99
import { IDisposable } from 'vs/base/common/lifecycle';
10-
import { IStorageService } from 'vs/platform/storage/node/storage';
10+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
1111
import Event, { Emitter, once } from 'vs/base/common/event';
1212
import { ConfigWatcher } from 'vs/base/node/config';
1313
import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
@@ -58,7 +58,7 @@ export class KeybindingsResolver {
5858
onKeybindingsChanged: Event<void> = this._onKeybindingsChanged.event;
5959

6060
constructor(
61-
@IStorageService private storageService: IStorageService,
61+
@IStorageMainService private storageService: IStorageMainService,
6262
@IEnvironmentService environmentService: IEnvironmentService,
6363
@IWindowsMainService private windowsService: IWindowsMainService,
6464
@ILogService private logService: ILogService

‎src/vs/code/electron-main/main.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
2121
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
2222
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
2323
import { ILogService, LogMainService } from 'vs/platform/log/common/log';
24-
import { IStorageService, StorageService } from 'vs/platform/storage/node/storage';
24+
import { StorageMainService } from 'vs/platform/storage2/node/storageMainService';
25+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
2526
import { IBackupMainService } from 'vs/platform/backup/common/backup';
2627
import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainService';
2728
import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
@@ -49,7 +50,7 @@ function createServices(args: ParsedArgs): IInstantiationService {
4950
services.set(IWorkspacesMainService, new SyncDescriptor(WorkspacesMainService));
5051
services.set(IHistoryMainService, new SyncDescriptor(HistoryMainService));
5152
services.set(ILifecycleService, new SyncDescriptor(LifecycleService));
52-
services.set(IStorageService, new SyncDescriptor(StorageService));
53+
services.set(IStorageMainService, new SyncDescriptor(StorageMainService));
5354
services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
5455
services.set(IRequestService, new SyncDescriptor(RequestService));
5556
services.set(IURLService, new SyncDescriptor(URLService, args['open-url']));

‎src/vs/code/electron-main/window.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as path from 'path';
99
import * as objects from 'vs/base/common/objects';
1010
import nls = require('vs/nls');
1111
import URI from 'vs/base/common/uri';
12-
import { IStorageService } from 'vs/platform/storage/node/storage';
12+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
1313
import { shell, screen, BrowserWindow, systemPreferences, app, TouchBar, nativeImage } from 'electron';
1414
import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
1515
import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
@@ -104,7 +104,7 @@ export class CodeWindow implements ICodeWindow {
104104
@ILogService private logService: ILogService,
105105
@IEnvironmentService private environmentService: IEnvironmentService,
106106
@IConfigurationService private configurationService: IConfigurationService,
107-
@IStorageService private storageService: IStorageService,
107+
@IStorageMainService private storageService: IStorageMainService,
108108
@IWorkspacesMainService private workspaceService: IWorkspacesMainService,
109109
@IBackupMainService private backupService: IBackupMainService
110110
) {

‎src/vs/code/electron-main/windows.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import * as arrays from 'vs/base/common/arrays';
1212
import { assign, mixin, equals } from 'vs/base/common/objects';
1313
import { IBackupMainService } from 'vs/platform/backup/common/backup';
1414
import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
15-
import { IStorageService } from 'vs/platform/storage/node/storage';
15+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
1616
import { CodeWindow, IWindowState as ISingleWindowState, defaultWindowState, WindowMode } from 'vs/code/electron-main/window';
1717
import { ipcMain as ipc, screen, BrowserWindow, dialog, systemPreferences, app } from 'electron';
1818
import { IPathWithLineAndColumn, parseLineAndColumnAware } from 'vs/code/node/paths';
@@ -139,7 +139,7 @@ export class WindowsManager implements IWindowsMainService {
139139

140140
constructor(
141141
@ILogService private logService: ILogService,
142-
@IStorageService private storageService: IStorageService,
142+
@IStorageMainService private storageService: IStorageMainService,
143143
@IEnvironmentService private environmentService: IEnvironmentService,
144144
@ILifecycleService private lifecycleService: ILifecycleService,
145145
@IBackupMainService private backupService: IBackupMainService,
@@ -1587,7 +1587,7 @@ class FileDialog {
15871587
constructor(
15881588
private environmentService: IEnvironmentService,
15891589
private telemetryService: ITelemetryService,
1590-
private storageService: IStorageService,
1590+
private storageService: IStorageMainService,
15911591
private windowsMainService: IWindowsMainService
15921592
) {
15931593
}

‎src/vs/platform/history/electron-main/historyMainService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as path from 'path';
99
import * as nls from 'vs/nls';
1010
import * as arrays from 'vs/base/common/arrays';
1111
import { trim } from 'vs/base/common/strings';
12-
import { IStorageService } from 'vs/platform/storage/node/storage';
12+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
1313
import { app } from 'electron';
1414
import { ILogService } from 'vs/platform/log/common/log';
1515
import { getPathLabel, getBaseLabel } from 'vs/base/common/labels';
@@ -41,7 +41,7 @@ export class HistoryMainService implements IHistoryMainService {
4141
private macOSRecentDocumentsUpdater: RunOnceScheduler;
4242

4343
constructor(
44-
@IStorageService private storageService: IStorageService,
44+
@IStorageMainService private storageService: IStorageMainService,
4545
@ILogService private logService: ILogService,
4646
@IWorkspacesMainService private workspacesService: IWorkspacesMainService,
4747
@IEnvironmentService private environmentService: IEnvironmentService,

‎src/vs/platform/lifecycle/electron-main/lifecycleMain.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { ipcMain as ipc, app } from 'electron';
99
import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
1010
import { ILogService } from 'vs/platform/log/common/log';
11-
import { IStorageService } from 'vs/platform/storage/node/storage';
11+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
1212
import Event, { Emitter } from 'vs/base/common/event';
1313
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1414
import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
@@ -94,7 +94,7 @@ export class LifecycleService implements ILifecycleService {
9494

9595
constructor(
9696
@ILogService private logService: ILogService,
97-
@IStorageService private storageService: IStorageService
97+
@IStorageMainService private storageService: IStorageMainService
9898
) {
9999
this.windowToCloseRequest = Object.create(null);
100100
this.quitRequested = false;

‎src/vs/platform/storage2/common/storage.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
'use strict';
7+
8+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
9+
10+
export const IStorageMainService = createDecorator<IStorageMainService>('storageMainService');
11+
12+
export interface IStorageMainService {
13+
_serviceBrand: any;
14+
15+
getItem<T>(key: string, defaultValue?: T): T;
16+
setItem(key: string, data: any): void;
17+
removeItem(key: string): void;
18+
}

src/vs/platform/storage/node/storage.ts renamed to src/vs/platform/storage2/node/storageMainService.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,9 @@
88
import * as path from 'path';
99
import * as fs from 'original-fs';
1010
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
11-
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1211
import { writeFileAndFlushSync } from 'vs/base/node/extfs';
1312
import { isUndefined, isUndefinedOrNull } from 'vs/base/common/types';
14-
15-
export const IStorageService = createDecorator<IStorageService>('storageService');
16-
17-
export interface IStorageService {
18-
_serviceBrand: any;
19-
20-
getItem<T>(key: string, defaultValue?: T): T;
21-
setItem(key: string, data: any): void;
22-
removeItem(key: string): void;
23-
}
13+
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
2414

2515
export class FileStorage {
2616

@@ -97,7 +87,7 @@ export class FileStorage {
9787
}
9888
}
9989

100-
export class StorageService implements IStorageService {
90+
export class StorageMainService implements IStorageMainService {
10191

10292
_serviceBrand: any;
10393

src/vs/platform/storage/test/node/storage.test.ts renamed to src/vs/platform/storage2/test/node/storage.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import path = require('path');
1111
import extfs = require('vs/base/node/extfs');
1212
import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
1313
import { writeFileAndFlushSync, mkdirp } from 'vs/base/node/extfs';
14-
import { FileStorage } from 'vs/platform/storage/node/storage';
14+
import { FileStorage } from 'vs/platform/storage2/node/storageMainService';
1515

16-
suite('StorageService', () => {
16+
suite('StorageMainService', () => {
1717
const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'storageservice');
1818
const storageFile = path.join(parentDir, 'storage.json');
1919

0 commit comments

Comments
 (0)