fix: always dispose debug unexpected widget in the end

opensumi · Feb 10, 2025 · 3d86ea3 · 3d86ea3
1 parent 9391b86
commit 3d86ea3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/packages/core-browser/src/components/ai-native/ai-action/index.tsx b/packages/core-browser/src/components/ai-native/ai-action/index.tsx
@@ -94,7 +94,7 @@ export const AIAction = (props: AIActionProps) => {
   });
 
   const Logo = useMemo(() => {
-    const InlineChatLogo = aiNativeConfigService.inlineChat.logo;
+    const InlineChatLogo = aiNativeConfigService?.inlineChat.logo;
 
     if (typeof InlineChatLogo === 'string') {
       return <img src={InlineChatLogo} className={styles.ai_action_icon} />;
@@ -105,7 +105,7 @@ export const AIAction = (props: AIActionProps) => {
     }
 
     return null;
-  }, [aiNativeConfigService.inlineChat.logo]);
+  }, [aiNativeConfigService?.inlineChat.logo]);
 
   /**
    * loading 的遮罩

diff --git a/packages/core-browser/src/react-hooks/injectable-hooks.tsx b/packages/core-browser/src/react-hooks/injectable-hooks.tsx
@@ -16,7 +16,7 @@ function isDisposable(target: any): target is Disposable {
 export function useInjectable<T = any>(Constructor: Token, args?: any): T {
   const { injector } = useContext(ConfigContext);
 
-  const instance = useMemo(() => injector.get(Constructor, args), [injector, Constructor]);
+  const instance = useMemo(() => injector?.get(Constructor, args), [injector, Constructor]);
 
   useEffect(
     () => () => {

diff --git a/packages/debug/src/browser/debug-session.ts b/packages/debug/src/browser/debug-session.ts
@@ -1092,21 +1092,14 @@ export class DebugSession implements IDebugSession {
     return this.connection.onDidCustomEvent;
   }
 
-  // REPL
-
   hasSeparateRepl(): boolean {
     return !this.parentSession || this.options.repl !== 'mergeWithParent';
   }
 
-  // REPL end
-
-  // report service
   reportTime(name: string, defaults?: any): (msg: string | undefined, extra?: any) => number {
     return this.sessionManager.reportTime(name, defaults);
   }
 
-  // Cancellation
-
   private getNewCancellationToken(threadId: number, token?: CancellationToken): CancellationToken {
     const tokenSource = new CancellationTokenSource(token);
     const tokens = this.cancellationMap.get(threadId) || [];
@@ -1133,8 +1126,6 @@ export class DebugSession implements IDebugSession {
     }
   }
 
-  // Cancellation end
-
   public getDebugProtocolBreakpoint(breakpointId: string): DebugProtocol.Breakpoint | undefined {
     const data = this.breakpointManager.getBreakpoints().find((bp) => bp.id === breakpointId);
     if (data) {
@@ -1164,8 +1155,6 @@ export class DebugSession implements IDebugSession {
     return this.modelManager.model;
   }
 
-  // memory
-
   public async readMemory(
     memoryReference: string,
     offset: number,
@@ -1188,6 +1177,4 @@ export class DebugSession implements IDebugSession {
     }
     return Promise.resolve(undefined);
   }
-
-  // memory end
 }
diff --git a/packages/debug/src/browser/editor/debug-editor-contribution.ts b/packages/debug/src/browser/editor/debug-editor-contribution.ts
@@ -275,6 +275,12 @@ export class DebugEditorContribution implements IEditorFeatureContribution {
       }),
     );
 
+    this.disposer.addDispose(
+      this.debugSessionManager.onDidDestroyDebugSession(() => {
+        this.closeExceptionWidget();
+      }),
+    );
+
     this.disposer.addDispose(this.editorDisposer);
 
     this.toggleExceptionWidget();