feat: dispose all diff previewer

opensumi · Jul 5, 2024 · a86907e · a86907e
1 parent bab2ec0
commit a86907e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/packages/ai-native/src/browser/widget/inline-chat/inline-chat-controller.ts b/packages/ai-native/src/browser/widget/inline-chat/inline-chat-controller.ts
@@ -38,7 +38,7 @@ export class InlineChatController {
 
   constructor(readonly options?: InlineChatControllerOptions) {}
 
-  public deffered: Deferred<void> = new Deferred();
+  public deferred: Deferred<void> = new Deferred();
 
   private calculateCodeBlocks(content: string): string {
     if (!this.options?.enableCodeblockRender) {
@@ -70,7 +70,7 @@ export class InlineChatController {
   }
 
   public async mountReadable(stream: SumiReadableStream<IChatProgress>): Promise<void> {
-    await this.deffered.promise;
+    await this.deferred.promise;
     const reply = new ReplyResponse('');
     let wholeContent = '';
 

diff --git a/packages/ai-native/src/browser/widget/inline-chat/inline-chat.handler.ts b/packages/ai-native/src/browser/widget/inline-chat/inline-chat.handler.ts
@@ -8,6 +8,7 @@ import {
   CancellationTokenSource,
   ChatResponse,
   Disposable,
+  Emitter,
   ErrorResponse,
   Event,
   IAIReporter,
@@ -37,6 +38,7 @@ import {
 } from '../inline-diff/inline-diff-previewer';
 import { InlineDiffWidget } from '../inline-diff/inline-diff-widget';
 import { InlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
+import { IPartialEditEvent } from '../inline-stream-diff/live-preview.decoration';
 
 import { InlineChatController } from './inline-chat-controller';
 import { InlineChatFeatureRegistry } from './inline-chat.feature.registry';
@@ -72,6 +74,9 @@ export class InlineChatHandler extends Disposable {
   @Autowired(CodeActionService)
   private readonly codeActionService: CodeActionService;
 
+  private readonly _onPartialEditEvent = this.registerDispose(new Emitter<IPartialEditEvent>());
+  public readonly onPartialEditEvent: Event<IPartialEditEvent> = this._onPartialEditEvent.event;
+
   private logger: ILogServiceClient;
 
   private diffPreviewer: BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler>;
@@ -334,12 +339,21 @@ export class InlineChatHandler extends Disposable {
       EInlineDiffPreviewMode.inlineLive,
     );
 
+    if (!this.aiInlineChatDisposed.disposed) {
+      this.aiInlineChatDisposed.dispose();
+    }
+
     if (inlineDiffMode === EInlineDiffPreviewMode.sideBySide) {
       this.diffPreviewer = this.injector.get(SideBySideInlineDiffWidget, [monacoEditor, crossSelection]);
     } else {
       this.diffPreviewer = this.injector.get(LiveInlineDiffPreviewer, [monacoEditor, crossSelection]);
+      this.aiInlineChatDisposed.addDispose(
+        (this.diffPreviewer as LiveInlineDiffPreviewer).onPartialEditEvent((event) => {
+          this._onPartialEditEvent.fire(event);
+        }),
+      );
     }
-
+    this.aiInlineChatDisposed.addDispose(this.diffPreviewer);
     this.diffPreviewer.mount(this.aiInlineContentWidget);
 
     this.diffPreviewer.show(
@@ -352,7 +366,7 @@ export class InlineChatHandler extends Disposable {
 
       this.aiInlineChatOperationDisposed.addDispose(
         this.diffPreviewer.onReady(() => {
-          controller.deffered.resolve();
+          controller.deferred.resolve();
 
           this.aiInlineChatOperationDisposed.addDispose([
             controller.onData((data) => {
@@ -444,10 +458,6 @@ export class InlineChatHandler extends Disposable {
     );
   }
 
-  get onPartialEditEvent() {
-    return (this.diffPreviewer as LiveInlineDiffPreviewer).onPartialEditEvent;
-  }
-
   acceptAllPartialEdits() {
     this.diffPreviewer.handleAction(EResultKind.ACCEPT);
   }

diff --git a/packages/ai-native/src/browser/widget/inline-input/inline-input.handler.ts b/packages/ai-native/src/browser/widget/inline-input/inline-input.handler.ts
@@ -84,7 +84,7 @@ export class InlineInputHandler extends Disposable {
       if (InlineChatController.is(previewResponse)) {
         const controller = previewResponse as InlineChatController;
 
-        controller.deffered.resolve();
+        controller.deferred.resolve();
 
         inputDisposable.addDispose([
           controller.onData(async (data) => {