chore: 修复组件卸载问题

Author: guqiankun.gqk

packages/core/src/client/index.ts

@@ -7,6 +7,7 @@ import {
   PreferenceProviderProvider,
   PreferenceScope,
   PreferenceProvider,
+  IContextKeyService,
 } from '@opensumi/ide-core-browser';
 import { ClientApp as BasicClientApp } from '@opensumi/ide-core-browser/lib/bootstrap/app';
 
@@ -56,6 +57,7 @@ import {
   MonacoCodeService,
   monacoCodeServiceProxy,
 } from './override/monacoOverride/codeEditorService';
+import { MonacoContextKeyServiceOverride } from './override/monacoOverride/contextKeyService';
 
 // import { MonacoOverrides } from './override/monacoOverride';
 export * from './override/monacoOverride/codeEditorService';
@@ -128,6 +130,11 @@ export class ClientModule extends BrowserModule {
       token: IMonacoOverrideService,
       useClass: MonacoOverrideService,
     },
+    {
+      token: IContextKeyService,
+      useClass: MonacoContextKeyServiceOverride,
+      override: true,
+    },
   ];
   preferences = injectDebugPreferences;
 }
@@ -140,6 +147,7 @@ export { IClientAppOpts };
 // 先 dispose，待 opensumi 修复
 // @ts-ignore
 export class ClientApp extends BasicClientApp {
+  private disposeSideEffect = () => {};
 
   private modules: ModuleConstructor[] = [];
 

packages/core/src/client/override/monacoContextKeyService.ts

@@ -3,6 +3,7 @@ import {
   MonacoContribution,
   Domain,
   MonacoOverrideServiceRegistry,
+  IContextKeyService,
 } from '@opensumi/ide-core-browser';
 import { StandaloneKeybindingServiceProxy } from './monacoOverride/standaloneKeybindingService';
 
@@ -16,18 +17,21 @@ export const IMonacoOverrideService = Symbol('IMonacoOverrideService');
 @Domain(MonacoContribution)
 export class MonacoOverrideService implements MonacoContribution {
   @Autowired(ICommandServiceToken)
-  monacoCommandService: MonacoCommandService;
+  private monacoCommandService: MonacoCommandService;
 
   @Autowired(MonacoCodeService)
-  monacoCodeService: MonacoCodeService;
+  private monacoCodeService: MonacoCodeService;
+
+  @Autowired(IContextKeyService)
+  private readonly globalContextKeyService: IContextKeyService;
 
   registerOverrideService(registry: MonacoOverrideServiceRegistry) {
 
     // TODO opensumi ServiceNames
     registry.registerOverrideService(
       // @ts-ignore
       'keybindingService',
-      new StandaloneKeybindingServiceProxy(this.monacoCodeService, this.monacoCommandService)
+      new StandaloneKeybindingServiceProxy(this.globalContextKeyService.contextKeyService, this.monacoCodeService, this.monacoCommandService)
     );
   }
 }

packages/core/src/client/override/monacoOverride/contextKeyService.ts

@@ -209,8 +209,9 @@ export class MonacoContextKeyServiceOverride
 
   constructor() {
     super();
-    this.contextKeyService = new ContextKeyService(this.configurationService);
+    this.contextKeyService = (window as any).contextService || new ContextKeyService(this.configurationService);
     this.listenToContextChanges();
+    (window as any).contextService = this.contextKeyService
   }
 
   dispose(): void {

packages/core/src/client/override/monacoOverride/standaloneKeybindingService.ts

@@ -1,17 +1,18 @@
 import { ICommandService } from '@opensumi/monaco-editor-core/esm/vs/platform/commands/common/commands';
 import { StandaloneKeybindingService } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IContextKeyService } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService as IMonacoContextKeyService  } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from '@opensumi/monaco-editor-core/esm/vs/platform/telemetry/common/telemetry';
 import { INotificationService } from '@opensumi/monaco-editor-core/esm/vs/platform/notification/common/notification';
 import { ILogService } from '@opensumi/monaco-editor-core/esm/vs/platform/log/common/log';
 import { ICodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
 
 export class StandaloneKeybindingServiceProxy extends StandaloneKeybindingService {
   // TODO contextService
-  constructor(monacoCodeService: ICodeEditorService, monacoCommandService: ICommandService) {
+  constructor(contextkeyService: IMonacoContextKeyService ,monacoCodeService: ICodeEditorService, monacoCommandService: ICommandService) {
     super(
-      StandaloneServices.get(IContextKeyService),
+      contextkeyService,
+      // StandaloneServices.get(IContextKeyService),
       monacoCommandService,
       // StandaloneServices.get(ICommandService),
       StandaloneServices.get(ITelemetryService),

packages/integrations/src/sql/index.tsx

@@ -122,10 +122,9 @@ const App = () => {
     setCurrent(e.key);
     // 每次切换tab 打开对应的文件
     if(e.key === '1') {
-      SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test_uri1/test.sql');
+      SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test_uri1/test.sql', '');
     }else {
-      SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test_uri2/test.sql');
-
+      SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test_uri3/test.sql');
     }
   };
 

packages/integrations/src/startup/index.tsx

@@ -84,7 +84,7 @@ if (pathParts[2]) {
 config.refPath = pathParts.slice(3).join('/');
 
 const App = () => (
-  <AppRenderer2
+  <AppRenderer
     onLoad={(app) => {
       window.app = app;
       window.testPlugin = () => {

packages/toolkit/public/index.html

@@ -12,8 +12,8 @@
         margin: 0;
       }
       #main {
-        /* width: 100vw;
-        height: 100vh; */
+        width: 100vw;
+        height: 100vh;
         margin: 0;
         padding: 0;
         overflow: hidden;