maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sqlite - onWillClose => onWillSaveState

Browse source
This commit is contained in:
Benjamin Pasero 2018-10-15 08:55:13 +02:00
parent 6187c66727
commit 5e67c08dab
16 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/editor/contrib/find/test/findController.test.ts
View file

@ -62,7 +62,7 @@ suite('FindController', () => {
serviceCollection.set(IStorageService, {
_serviceBrand: undefined,
onDidChangeStorage: Event.None,
onWillClose: Event.None,
onWillSaveState: Event.None,
get: (key: string) => queryState[key],
getBoolean: (key: string) => !!queryState[key],
getInteger: (key: string) => undefined,
@ -437,7 +437,7 @@ suite('FindController query options persistence', () => {
serviceCollection.set(IStorageService, {
_serviceBrand: undefined,
onDidChangeStorage: Event.None,
onWillClose: Event.None,
onWillSaveState: Event.None,
get: (key: string) => queryState[key],
getBoolean: (key: string) => !!queryState[key],
getInteger: (key: string) => undefined,

2
src/vs/editor/contrib/multicursor/test/multicursor.test.ts
View file

@ -62,7 +62,7 @@ suite('Multicursor selection', () => {
serviceCollection.set(IStorageService, {
_serviceBrand: undefined,
onDidChangeStorage: Event.None,
onWillClose: Event.None,
onWillSaveState: Event.None,
get: (key: string) => queryState[key],
getBoolean: (key: string) => !!queryState[key],
getInteger: (key: string) => undefined,

2
src/vs/editor/contrib/suggest/suggestMemory.ts
View file

@ -208,7 +208,7 @@ export class SuggestMemories extends Disposable {
this._setMode(editor.getConfiguration().contribInfo.suggestSelection);
this._register(editor.onDidChangeConfiguration(e => e.contribInfo && this._setMode(editor.getConfiguration().contribInfo.suggestSelection)));
this._register(_storageService.onWillClose(() => this._saveState()));
this._register(_storageService.onWillSaveState(() => this._saveState()));
}
private _setMode(mode: MemMode): void {

6
src/vs/platform/storage/common/storage.ts
View file

@ -18,11 +18,11 @@ export interface IStorageService {
readonly onDidChangeStorage: Event<IWorkspaceStorageChangeEvent>;
/**
* Emitted when the storage is about to close. This is the right time
* Emitted when the storage is about to persist. This is the right time
* to persist data to ensure it is stored before the application shuts
* down.
*/
readonly onWillClose: Event<ShutdownReason>;
readonly onWillSaveState: Event<ShutdownReason>;
/**
* Retrieve an element stored with the given key from storage. Use
@ -93,7 +93,7 @@ export const NullStorageService: IStorageService = {
_serviceBrand: undefined,
onDidChangeStorage: Event.None,
onWillClose: Event.None,
onWillSaveState: Event.None,
get(key: string, scope: StorageScope, fallbackValue?: string): string | undefined {
return fallbackValue;

6
src/vs/platform/storage/electron-browser/storageService.ts
View file

@ -23,7 +23,7 @@ export class StorageService extends Disposable implements IStorageService {
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; }
private _onWillClose: Emitter<ShutdownReason> = this._register(new Emitter<ShutdownReason>());
get onWillClose(): Event<ShutdownReason> { return this._onWillClose.event; }
get onWillSaveState(): Event<ShutdownReason> { return this._onWillClose.event; }
private globalStorage: Storage;
private workspaceStorage: Storage;
@ -106,7 +106,7 @@ export class DelegatingStorageService extends Disposable implements IStorageServ
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; }
private _onWillClose: Emitter<ShutdownReason> = this._register(new Emitter<ShutdownReason>());
get onWillClose(): Event<ShutdownReason> { return this._onWillClose.event; }
get onWillSaveState(): Event<ShutdownReason> { return this._onWillClose.event; }
private closed: boolean;
@ -123,7 +123,7 @@ export class DelegatingStorageService extends Disposable implements IStorageServ
private registerListeners(): void {
this._register(this.storageService.onDidChangeStorage(e => this._onDidChangeStorage.fire(e)));
this._register(this.storageService.onWillClose(reason => this._onWillClose.fire(reason)));
this._register(this.storageService.onWillSaveState(reason => this._onWillClose.fire(reason)));
const globalKeyMarker = 'storage://global/';
this._register(addDisposableListener(window, 'storage', (e: StorageEvent) => {

2
src/vs/workbench/browser/layout.ts
View file

@ -121,7 +121,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
private registerListeners(): void {
this._register(this.themeService.onThemeChange(_ => this.layout()));
this._register(this.parts.editor.onDidSizeConstraintsChange(() => this.onDidEditorSizeConstraintsChange()));
this._register(this.storageService.onWillClose(() => {
this._register(this.storageService.onWillSaveState(() => {
this.saveStateScheduler.dispose();
this.saveState();
}));

2
src/vs/workbench/browser/parts/views/views.ts
View file

@ -431,7 +431,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
this._register(this.onDidAdd(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
this._register(this.onDidRemove(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
this._register(this.storageService.onWillClose(() => this.saveViewsStates()));
this._register(this.storageService.onWillSaveState(() => this.saveViewsStates()));
}
private saveViewsStates(): void {

2
src/vs/workbench/common/component.ts
View file

@ -22,7 +22,7 @@ export class Component extends Themable {
this.id = id;
this.memento = new Memento(this.id, storageService);
this._register(storageService.onWillClose(() => {
this._register(storageService.onWillSaveState(() => {
// Ask the component to persist state into the memento
this.saveState();

2
src/vs/workbench/electron-browser/shell.ts
View file

@ -170,7 +170,7 @@ export class WorkbenchShell extends Disposable {
// Warm up font cache information before building up too many dom elements
restoreFontInfo(this.storageService);
readFontInfo(BareFontInfo.createFromRawSettings(this.configurationService.getValue('editor'), browser.getZoomLevel()));
this._register(this.storageService.onWillClose(() => {
this._register(this.storageService.onWillSaveState(() => {
saveFontInfo(this.storageService); // Keep font info for next startup around
}));

2
src/vs/workbench/electron-browser/workbench.ts
View file

@ -476,7 +476,7 @@ export class Workbench extends Disposable implements IPartService {
private registerListeners(): void {
// Storage lifecycle
this._register(this.storageService.onWillClose(reason => this.saveState(reason)));
this._register(this.storageService.onWillSaveState(reason => this.saveState(reason)));
// Listen to visible editor changes
this._register(this.editorService.onDidVisibleEditorsChange(() => this.onDidVisibleEditorsChange()));

2
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
View file

@ -238,7 +238,7 @@ export class ConfigurationManager implements IConfigurationManager {
}
}));
this.toDispose.push(this.storageService.onWillClose(this.saveState, this));
this.toDispose.push(this.storageService.onWillSaveState(this.saveState, this));
}
private initLaunches(): void {

2
src/vs/workbench/parts/debug/electron-browser/debugService.ts
View file

@ -134,7 +134,7 @@ export class DebugService implements IDebugService {
this.viewModel = new ViewModel(contextKeyService);
this.toDispose.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
this.toDispose.push(this.storageService.onWillClose(this.saveState, this));
this.toDispose.push(this.storageService.onWillSaveState(this.saveState, this));
this.lifecycleService.onShutdown(this.dispose, this);
this.toDispose.push(this.broadcastService.onBroadcast(broadcast => {

2
src/vs/workbench/parts/output/electron-browser/outputServices.ts
View file

@ -471,7 +471,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
}
this._register(this.lifecycleService.onShutdown(() => this.dispose()));
this._register(this.storageService.onWillClose(() => this.saveState()));
this._register(this.storageService.onWillSaveState(() => this.saveState()));
}
provideTextContent(resource: URI): TPromise<ITextModel> {

2
src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
View file

@ -109,7 +109,7 @@ class CommandsHistory {
private registerListeners(): void {
this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration());
once(this.storageService.onWillClose)(() => this.saveState());
once(this.storageService.onWillSaveState)(() => this.saveState());
}
private saveState(): void {

2
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
View file

@ -535,7 +535,7 @@ class TaskService extends Disposable implements ITaskService {
}));
this._taskRunningState = TASK_RUNNING_STATE.bindTo(contextKeyService);
this._register(lifecycleService.onWillShutdown(event => event.veto(this.beforeShutdown())));
this._register(storageService.onWillClose(() => this.saveState()));
this._register(storageService.onWillSaveState(() => this.saveState()));
this._onDidStateChange = this._register(new Emitter());
this.registerCommands();
}

2
src/vs/workbench/services/history/electron-browser/history.ts
View file

@ -175,7 +175,7 @@ export class HistoryService extends Disposable implements IHistoryService {
this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
this._register(this.editorService.onDidOpenEditorFail(event => this.remove(event.editor)));
this._register(this.editorService.onDidCloseEditor(event => this.onEditorClosed(event)));
this._register(this.storageService.onWillClose(reason => this.saveState()));
this._register(this.storageService.onWillSaveState(reason => this.saveState()));
this._register(this.fileService.onFileChanges(event => this.onFileChanges(event)));
this._register(this.resourceFilter.onExpressionChange(() => this.handleExcludesChange()));
}