Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-06-01 05:04:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

storage => main storage (storage2)

Browse Source
This commit is contained in:
Benjamin Pasero
2017-11-23 15:03:14 +01:00
parent 5278d8764f
commit e3085ebf26
10 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/electron-main/app.ts
+2 -2
View File
@@ -26,7 +26,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ILogService } from 'vs/platform/log/common/log';
import { IStorageService } from 'vs/platform/storage/node/storage';
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IURLService } from 'vs/platform/url/common/url';
@@ -74,7 +74,7 @@ export class CodeApplication {
@IEnvironmentService private environmentService: IEnvironmentService,
@ILifecycleService private lifecycleService: ILifecycleService,
@IConfigurationService configurationService: ConfigurationService,
@IStorageService private storageService: IStorageService,
@IStorageMainService private storageService: IStorageMainService,
@IHistoryMainService private historyService: IHistoryMainService
) {
this.toDispose = [mainIpcServer, configurationService];
src/vs/code/electron-main/keyboard.ts
+2 -2
View File
@@ -7,7 +7,7 @@
import * as nativeKeymap from 'native-keymap';
import { IDisposable } from 'vs/base/common/lifecycle';
import { IStorageService } from 'vs/platform/storage/node/storage';
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
import Event, { Emitter, once } from 'vs/base/common/event';
import { ConfigWatcher } from 'vs/base/node/config';
import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
@@ -58,7 +58,7 @@ export class KeybindingsResolver {
onKeybindingsChanged: Event<void> = this._onKeybindingsChanged.event;
constructor(
@IStorageService private storageService: IStorageService,
@IStorageMainService private storageService: IStorageMainService,
@IEnvironmentService environmentService: IEnvironmentService,
@IWindowsMainService private windowsService: IWindowsMainService,
@ILogService private logService: ILogService
src/vs/code/electron-main/main.ts
+3 -2
View File
@@ -21,7 +21,8 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ILogService, LogMainService } from 'vs/platform/log/common/log';
import { IStorageService, StorageService } from 'vs/platform/storage/node/storage';
import { StorageMainService } from 'vs/platform/storage2/node/storageMainService';
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
import { IBackupMainService } from 'vs/platform/backup/common/backup';
import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainService';
import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
@@ -49,7 +50,7 @@ function createServices(args: ParsedArgs): IInstantiationService {
services.set(IWorkspacesMainService, new SyncDescriptor(WorkspacesMainService));
services.set(IHistoryMainService, new SyncDescriptor(HistoryMainService));
services.set(ILifecycleService, new SyncDescriptor(LifecycleService));
services.set(IStorageService, new SyncDescriptor(StorageService));
services.set(IStorageMainService, new SyncDescriptor(StorageMainService));
services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
services.set(IRequestService, new SyncDescriptor(RequestService));
services.set(IURLService, new SyncDescriptor(URLService, args['open-url']));
src/vs/code/electron-main/window.ts
+2 -2
View File
@@ -9,7 +9,7 @@ import * as path from 'path';
import * as objects from 'vs/base/common/objects';
import nls = require('vs/nls');
import URI from 'vs/base/common/uri';
import { IStorageService } from 'vs/platform/storage/node/storage';
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
import { shell, screen, BrowserWindow, systemPreferences, app, TouchBar, nativeImage } from 'electron';
import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
@@ -104,7 +104,7 @@ export class CodeWindow implements ICodeWindow {
@ILogService private logService: ILogService,
@IEnvironmentService private environmentService: IEnvironmentService,
@IConfigurationService private configurationService: IConfigurationService,
@IStorageService private storageService: IStorageService,
@IStorageMainService private storageService: IStorageMainService,
@IWorkspacesMainService private workspaceService: IWorkspacesMainService,
@IBackupMainService private backupService: IBackupMainService
) {
src/vs/code/electron-main/windows.ts
+3 -3
View File
@@ -12,7 +12,7 @@ import * as arrays from 'vs/base/common/arrays';
import { assign, mixin, equals } from 'vs/base/common/objects';
import { IBackupMainService } from 'vs/platform/backup/common/backup';
import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
import { IStorageService } from 'vs/platform/storage/node/storage';
import { IStorageMainService } from 'vs/platform/storage2/common/storage';
import { CodeWindow, IWindowState as ISingleWindowState, defaultWindowState, WindowMode } from 'vs/code/electron-main/window';
import { ipcMain as ipc, screen, BrowserWindow, dialog, systemPreferences, app } from 'electron';
import { IPathWithLineAndColumn, parseLineAndColumnAware } from 'vs/code/node/paths';
@@ -139,7 +139,7 @@ export class WindowsManager implements IWindowsMainService {
constructor(
@ILogService private logService: ILogService,
@IStorageService private storageService: IStorageService,
@IStorageMainService private storageService: IStorageMainService,
@IEnvironmentService private environmentService: IEnvironmentService,
@ILifecycleService private lifecycleService: ILifecycleService,
@IBackupMainService private backupService: IBackupMainService,
@@ -1587,7 +1587,7 @@ class FileDialog {
constructor(
private environmentService: IEnvironmentService,
private telemetryService: ITelemetryService,
private storageService: IStorageService,
private storageService: IStorageMainService,
private windowsMainService: IWindowsMainService
) {
}