fix: 注册时序问题

Author: guqiankun.gqk

packages/acr/src/modules/merge-request/merge-request.contribution.ts

@@ -1,15 +1,33 @@
-import { Domain, getIcon, localize } from '@opensumi/ide-core-browser';
-import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
+import { Domain, getIcon, localize, SlotLocation } from '@opensumi/ide-core-browser';
+import {
+  ComponentContribution,
+  ComponentRegistry,
+  ClientAppContribution,
+} from '@opensumi/ide-core-browser';
+import { Autowired } from '@opensumi/di';
 
 import { MergeRequestSummary } from './mr-summary';
 import { MergeRequestExplorerId } from './common';
 import { ChangeTreeView } from './changes-tree';
 import { WebSCMView } from './web-scm';
 import { MenuContribution, IMenuRegistry } from '@opensumi/ide-core-browser/lib/menu/next';
+import { LayoutState, LAYOUT_STATE } from '@opensumi/ide-core-browser/lib/layout/layout-state';
+import { IMainLayoutService } from '@opensumi/ide-main-layout';
+
+@Domain(ComponentContribution, MenuContribution, ClientAppContribution)
+// @ts-ignore
+export class MergeRequestContribution
+  implements ComponentContribution, MenuContribution, ClientAppContribution
+{
+  @Autowired(IMainLayoutService)
+  layoutService: IMainLayoutService;
+
+  @Autowired(ComponentRegistry)
+  componentRegistry: ComponentRegistry;
+
+  @Autowired()
+  private layoutState: LayoutState;
 
-@Domain(ComponentContribution, MenuContribution)
-export class MergeRequestContribution implements ComponentContribution, MenuContribution {
-  // MR Explorer
   registerComponent(registry: ComponentRegistry) {
     registry.register(MergeRequestExplorerId, [ChangeTreeView, WebSCMView], {
       titleComponent: MergeRequestSummary,
@@ -19,6 +37,27 @@ export class MergeRequestContribution implements ComponentContribution, MenuCont
     });
   }
 
+  onDidStart() {
+    const tabbarService = this.layoutService.getTabbarService(SlotLocation.left);
+    const componentRegistry =
+      this.componentRegistry.getComponentRegistryInfo(MergeRequestExplorerId);
+    if (componentRegistry) {
+      tabbarService.registerContainer(MergeRequestExplorerId, componentRegistry);
+      const state = this.layoutState.getState(LAYOUT_STATE.MAIN, {});
+      let currentId: string,
+        size: number = 0,
+        show = true;
+      for (const key in state) {
+        if (key === SlotLocation.left) {
+          currentId = state[key]?.currentId;
+          size = state[key]?.size || 0;
+          show = currentId ? true : false;
+        }
+      }
+      this.layoutService.toggleSlot(SlotLocation.left, show, size);
+    }
+  }
+
   registerMenus(menus: IMenuRegistry) {
     // 卸载左侧面板的右键菜单
     menus.unregisterMenuId(`accordion/${MergeRequestExplorerId}`);

packages/core/src/server/kaitian-extension/base.ts

@@ -1,32 +1,12 @@
 import { ExtraMetadata, IExtensionMetadata } from '@alipay/alex-shared';
 
+import {
+  IExtensionNodeClientService,
+  ExtensionNodeServiceServerPath,
+} from '@opensumi/ide-extension';
+
 // https://medium.com/javascript-in-plain-english/leveraging-type-only-imports-and-exports-with-typescript-3-8-5c1be8bd17fb
 // https://blog.logrocket.com/whats-new-in-typescript-3-8/
 export type { ExtraMetadata, IExtensionMetadata };
 
-export const ExtensionNodeServiceServerPath = 'ExtensionNodeServiceServerPath';
-
-export const IExtensionNodeClientService = Symbol('IExtensionNodeClientService');
-export interface IExtensionNodeClientService {
-  getElectronMainThreadListenPath(clientId: string): Promise<string>;
-  getAllExtensions(
-    scan: string[],
-    extensionCandidate: string[],
-    localization: string,
-    extraMetaData: ExtraMetadata
-  ): Promise<IExtensionMetadata[]>;
-  createProcess(clientId: string): Promise<void>;
-  getExtension(
-    extensionPath: string,
-    localization: string,
-    extraMetaData?: ExtraMetadata
-  ): Promise<IExtensionMetadata | undefined>;
-  infoProcessNotExist(): void;
-  infoProcessCrash(): void;
-  disposeClientExtProcess(clientId: string, info: boolean): Promise<void>;
-  updateLanguagePack(
-    languageId: string,
-    languagePackPath: string,
-    storagePath: string
-  ): Promise<void>;
-}
+export { IExtensionNodeClientService, ExtensionNodeServiceServerPath };

packages/core/src/server/kaitian-extension/extension.service.client.ts

@@ -67,6 +67,9 @@ export class ExtensionServiceClientImpl implements IExtensionNodeClientService {
   updateLanguagePack(): Promise<void> {
     return Promise.resolve();
   }
+  restartExtProcessByClient(): void {
+    throw new Error('Method not implemented.');
+  }
 }
 
 async function getExtraMetaData(