Skip to content

Commit 5e67c08

Browse files
author
Benjamin Pasero
committed
sqlite - onWillClose => onWillSaveState
1 parent 6187c66 commit 5e67c08

16 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎src/vs/editor/contrib/find/test/findController.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ suite('FindController', () => {
6262
serviceCollection.set(IStorageService, {
6363
_serviceBrand: undefined,
6464
onDidChangeStorage: Event.None,
65-
onWillClose: Event.None,
65+
onWillSaveState: Event.None,
6666
get: (key: string) => queryState[key],
6767
getBoolean: (key: string) => !!queryState[key],
6868
getInteger: (key: string) => undefined,
@@ -437,7 +437,7 @@ suite('FindController query options persistence', () => {
437437
serviceCollection.set(IStorageService, {
438438
_serviceBrand: undefined,
439439
onDidChangeStorage: Event.None,
440-
onWillClose: Event.None,
440+
onWillSaveState: Event.None,
441441
get: (key: string) => queryState[key],
442442
getBoolean: (key: string) => !!queryState[key],
443443
getInteger: (key: string) => undefined,

‎src/vs/editor/contrib/multicursor/test/multicursor.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ suite('Multicursor selection', () => {
6262
serviceCollection.set(IStorageService, {
6363
_serviceBrand: undefined,
6464
onDidChangeStorage: Event.None,
65-
onWillClose: Event.None,
65+
onWillSaveState: Event.None,
6666
get: (key: string) => queryState[key],
6767
getBoolean: (key: string) => !!queryState[key],
6868
getInteger: (key: string) => undefined,

‎src/vs/editor/contrib/suggest/suggestMemory.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export class SuggestMemories extends Disposable {
208208

209209
this._setMode(editor.getConfiguration().contribInfo.suggestSelection);
210210
this._register(editor.onDidChangeConfiguration(e => e.contribInfo && this._setMode(editor.getConfiguration().contribInfo.suggestSelection)));
211-
this._register(_storageService.onWillClose(() => this._saveState()));
211+
this._register(_storageService.onWillSaveState(() => this._saveState()));
212212
}
213213

214214
private _setMode(mode: MemMode): void {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ export interface IStorageService {
1818
readonly onDidChangeStorage: Event<IWorkspaceStorageChangeEvent>;
1919

2020
/**
21-
* Emitted when the storage is about to close. This is the right time
21+
* Emitted when the storage is about to persist. This is the right time
2222
* to persist data to ensure it is stored before the application shuts
2323
* down.
2424
*/
25-
readonly onWillClose: Event<ShutdownReason>;
25+
readonly onWillSaveState: Event<ShutdownReason>;
2626

2727
/**
2828
* Retrieve an element stored with the given key from storage. Use
@@ -93,7 +93,7 @@ export const NullStorageService: IStorageService = {
9393
_serviceBrand: undefined,
9494

9595
onDidChangeStorage: Event.None,
96-
onWillClose: Event.None,
96+
onWillSaveState: Event.None,
9797

9898
get(key: string, scope: StorageScope, fallbackValue?: string): string | undefined {
9999
return fallbackValue;

‎src/vs/platform/storage/electron-browser/storageService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class StorageService extends Disposable implements IStorageService {
2323
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; }
2424

2525
private _onWillClose: Emitter<ShutdownReason> = this._register(new Emitter<ShutdownReason>());
26-
get onWillClose(): Event<ShutdownReason> { return this._onWillClose.event; }
26+
get onWillSaveState(): Event<ShutdownReason> { return this._onWillClose.event; }
2727

2828
private globalStorage: Storage;
2929
private workspaceStorage: Storage;
@@ -106,7 +106,7 @@ export class DelegatingStorageService extends Disposable implements IStorageServ
106106
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; }
107107

108108
private _onWillClose: Emitter<ShutdownReason> = this._register(new Emitter<ShutdownReason>());
109-
get onWillClose(): Event<ShutdownReason> { return this._onWillClose.event; }
109+
get onWillSaveState(): Event<ShutdownReason> { return this._onWillClose.event; }
110110

111111
private closed: boolean;
112112

@@ -123,7 +123,7 @@ export class DelegatingStorageService extends Disposable implements IStorageServ
123123

124124
private registerListeners(): void {
125125
this._register(this.storageService.onDidChangeStorage(e => this._onDidChangeStorage.fire(e)));
126-
this._register(this.storageService.onWillClose(reason => this._onWillClose.fire(reason)));
126+
this._register(this.storageService.onWillSaveState(reason => this._onWillClose.fire(reason)));
127127

128128
const globalKeyMarker = 'storage://global/';
129129
this._register(addDisposableListener(window, 'storage', (e: StorageEvent) => {

‎src/vs/workbench/browser/layout.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
121121
private registerListeners(): void {
122122
this._register(this.themeService.onThemeChange(_ => this.layout()));
123123
this._register(this.parts.editor.onDidSizeConstraintsChange(() => this.onDidEditorSizeConstraintsChange()));
124-
this._register(this.storageService.onWillClose(() => {
124+
this._register(this.storageService.onWillSaveState(() => {
125125
this.saveStateScheduler.dispose();
126126
this.saveState();
127127
}));

‎src/vs/workbench/browser/parts/views/views.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
431431

432432
this._register(this.onDidAdd(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
433433
this._register(this.onDidRemove(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
434-
this._register(this.storageService.onWillClose(() => this.saveViewsStates()));
434+
this._register(this.storageService.onWillSaveState(() => this.saveViewsStates()));
435435
}
436436

437437
private saveViewsStates(): void {

‎src/vs/workbench/common/component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class Component extends Themable {
2222
this.id = id;
2323
this.memento = new Memento(this.id, storageService);
2424

25-
this._register(storageService.onWillClose(() => {
25+
this._register(storageService.onWillSaveState(() => {
2626

2727
// Ask the component to persist state into the memento
2828
this.saveState();

‎src/vs/workbench/electron-browser/shell.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export class WorkbenchShell extends Disposable {
170170
// Warm up font cache information before building up too many dom elements
171171
restoreFontInfo(this.storageService);
172172
readFontInfo(BareFontInfo.createFromRawSettings(this.configurationService.getValue('editor'), browser.getZoomLevel()));
173-
this._register(this.storageService.onWillClose(() => {
173+
this._register(this.storageService.onWillSaveState(() => {
174174
saveFontInfo(this.storageService); // Keep font info for next startup around
175175
}));
176176

‎src/vs/workbench/electron-browser/workbench.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ export class Workbench extends Disposable implements IPartService {
476476
private registerListeners(): void {
477477

478478
// Storage lifecycle
479-
this._register(this.storageService.onWillClose(reason => this.saveState(reason)));
479+
this._register(this.storageService.onWillSaveState(reason => this.saveState(reason)));
480480

481481
// Listen to visible editor changes
482482
this._register(this.editorService.onDidVisibleEditorsChange(() => this.onDidVisibleEditorsChange()));

0 commit comments

Comments
 (0)