Skip to content

Fix #213885, As much as possible flush the storage in beforeunload callback #213896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yiliang114 wants to merge 11 commits into from
Closed

Fix #213885, As much as possible flush the storage in beforeunload callback #213896

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3e0351
Fix #213885, make doShutdown asynchronous and wait for storage servic…
yiliang114 May 30, 2024
6e20407
Merge branch 'main' into uncomfortable-mule
yiliang114 May 30, 2024
1880505
improve zone revealing when showing above line 1 (#213904)
jrieken May 30, 2024
db640b3
fix wrong colors when editor findMatchForeground is not defined (#213…
SimonSiefke May 30, 2024
60f4cec
Only fire collapsible change event if actually changed. (#213910)
alexr00 May 30, 2024
fb4d81a
On request-removal undo till the point at which the request was made …
jrieken May 30, 2024
11e177d
Merge pull request #213908 from microsoft/tyriar/212180
Tyriar May 30, 2024
3cf9269
Merge pull request #213905 from microsoft/tyriar/211933
Tyriar May 30, 2024
06069bb
Fix #213885, make doShutdown asynchronous and wait for storage servic…
yiliang114 May 30, 2024
b3f7ec5
Merge remote-tracking branch 'origin' into uncomfortable-mule
yiliang114 May 30, 2024
7a3345a
Fix #213885, make doShutdown asynchronous and wait for storage servic…
yiliang114 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/vs/workbench/services/lifecycle/browser/lifecycleService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,14 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
private doShutdown(vetoShutdown?: () => void): void {
const logService = this.logService;

let storageServiceVeto = true;
// Optimistically trigger a UI state flush
// without waiting for it. The browser does
// not guarantee that this is being executed
// but if a dialog opens, we have a chance
// to succeed.
this.storageService.flush(WillSaveStateReason.SHUTDOWN);
// If the refresh is not completed, it needs to be regarded as a veto to try to evoke the dialog.
this.storageService.flush(WillSaveStateReason.SHUTDOWN).finally(() => storageServiceVeto = false);

let veto = false;

Expand Down Expand Up @@ -148,7 +150,7 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
});

// Veto: handle if provided
if (veto && typeof vetoShutdown === 'function') {
if ((veto || storageServiceVeto) && typeof vetoShutdown === 'function') {
return vetoShutdown();
}

Expand Down