Skip to content

fix: sumi extension restart logic #4498

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

Merged
erha19 merged 1 commit into from
Mar 26, 2025
Merged

fix: sumi extension restart logic #4498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions packages/extension/src/browser/extension-instance-management.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ export class ExtInstanceManagementService extends Disposable implements Abstract

public disposeExtensionInstancesByPath(paths: string[]) {
paths.forEach((path) => {
if (this.extensionMap.has(path)) {
this.extensionMap.get(path)!.dispose();
}
this.extensionMap.get(path)?.dispose();
});
}

Expand Down
17 changes: 12 additions & 5 deletions packages/extension/src/browser/extension.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
private isExtProcessWaitingForRestart: ERestartPolicy | undefined;
private pCrashMessageModel: MayCancelablePromise<string | undefined> | undefined;

// 是否正在显示插件重启的 loading 状态
private isProgressShowing = false;

// 针对 activationEvents 为 * 的插件
public eagerExtensionsActivated: Deferred<void> = new Deferred();

Expand Down Expand Up @@ -383,6 +386,7 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
this.logger.log('[ext-restart]: ext process restart canceled');
this.isExtProcessRestarting = false;
this.isExtProcessWaitingForRestart = undefined;
this.isProgressShowing = false;
});

try {
Expand All @@ -393,6 +397,7 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi

this.isExtProcessRestarting = false;
this.isExtProcessWaitingForRestart = undefined;
this.isProgressShowing = false;

this.disposeAllOverlayWindow();
};
Expand All @@ -412,6 +417,12 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
break;
}
case ERestartPolicy.Always:
if (this.isProgressShowing) {
this.logger.log('[ext-restart]: progress is already showing, skip');
return;
}

this.isProgressShowing = true;
await this.progressService.withProgress(
{
location: ProgressLocation.Notification,
Expand All @@ -429,9 +440,7 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
],
},
async () => {
if (this.extProcessRestartPromise) {
this.extProcessRestartPromise.cancel();
}
// doRestart 存在严重的副作用且不可 Cancel，因此单次重启只允许执行一次
this.extProcessRestartPromise = createCancelablePromise(doRestart);
await this.extProcessRestartPromise;
},
Expand Down Expand Up @@ -769,13 +778,11 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
private async rerunSumiViewExtensionContributes() {
const { activatedViewExtensionMap } = this.viewExtensionService;
const extensionPaths = Array.from(activatedViewExtensionMap.keys());

await Promise.all(
extensionPaths.map((path) => {
const extension = this.extensionInstanceManageService.getExtensionInstanceByPath(path);
if (extension) {
extension.initialize();
this.contributesService.register(extension.id, extension.contributes);
this.sumiContributesService.register(extension.id, extension.packageJSON.sumiContributes || {});
}
}),
Expand Down
Loading