Skip to content
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

Jump to bottom

Partially reverts 1b83b96a4658097d1939f0b6ec68823197340a00 #165372

Merged
merged 2 commits into from
Nov 3, 2022
Merged

Partially reverts 1b83b96a4658097d1939f0b6ec68823197340a00 #165372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6d7277
Partially reverts https://github.com/microsoft/vscode/commit/1b83b96a…
joyceerhl Nov 3, 2022
fb25963
Merge branch 'main' into dev/joyceerhl/eligible-sawfish
joyceerhl Nov 3, 2022
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
8 changes: 6 additions & 2 deletions src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,11 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
// Run the store action to get back a ref
let ref: string | undefined;
if (shouldStoreEditSession) {
ref = await that.storeEditSession(false);
ref = await that.progressService.withProgress({
location: ProgressLocation.Notification,
type: 'syncing',
title: localize('store your edit session', 'Storing your edit session...')
}, async () => that.storeEditSession(false));
}

let uri = workspaceUri ?? await that.pickContinueEditSessionDestination();
Expand Down Expand Up @@ -406,7 +410,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
} else if (ref !== undefined) {
this.notificationService.warn(localize('no edit session content for ref', 'Could not resume edit session contents for ID {0}.', ref));
}
this.logService.info(`Aborting resuming edit session as no edit session content is available to be applied from ref ${ref}.`);
this.logService.info(ref !== undefined ? `Aborting resuming edit session as no edit session content is available to be applied from ref ${ref}.` : `Aborting resuming edit session as no edit session content is available to be applied`);
return;
}
const editSession = data.editSession;
Expand Down