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

Also wait for user data init #180549

Merged
merged 2 commits into from Apr 21, 2023
Merged

Also wait for user data init #180549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed93e4d
Also wait for user data init
sandy081 Apr 21, 2023
3b56dca
wait only when init is required
sandy081 Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/vs/workbench/services/userData/browser/userDataInit.ts
View file
Open in desktop
Expand Up @@ -32,7 +32,9 @@ export class UserDataInitializationService implements IUserDataInitializationSer
}

async whenInitializationFinished(): Promise<void> {
await Promise.all(this.initializers.map(initializer => initializer.whenInitializationFinished()));
if (await this.requiresInitialization()) {
await Promise.all(this.initializers.map(initializer => initializer.whenInitializationFinished()));
}
}

async requiresInitialization(): Promise<boolean> {
Expand Down
4 changes: 3 additions & 1 deletion src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
import { isDiffEditorInput } from 'vs/workbench/common/editor';
import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';

type AccountQuickPickItem = { label: string; authenticationProvider: IAuthenticationProvider; account?: UserDataSyncAccount; description?: string };

Expand Down Expand Up @@ -114,6 +115,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
@ILifecycleService private readonly lifecycleService: ILifecycleService,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@IEditorService private readonly editorService: IEditorService,
@IUserDataInitializationService private readonly userDataInitializationService: IUserDataInitializationService,
) {
super();
this.syncEnablementContext = CONTEXT_SYNC_ENABLEMENT.bindTo(contextKeyService);
Expand Down Expand Up @@ -143,7 +145,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat

private async waitAndInitialize(): Promise<void> {
/* wait */
await this.extensionService.whenInstalledExtensionsRegistered();
await Promise.all([this.extensionService.whenInstalledExtensionsRegistered(), this.userDataInitializationService.whenInitializationFinished()]);

/* initialize */
try {
Expand Down