feat: control whether previewer to dispose when editor closed (#3888)

* feat: add dispose option * fix: show previewer support option * fix: store options
opensumi · Jul 29, 2024 · b649b61 · b649b61
1 parent 94b67ea
commit b649b61
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/packages/ai-native/src/browser/widget/inline-diff/inline-diff-previewer.ts b/packages/ai-native/src/browser/widget/inline-diff/inline-diff-previewer.ts
@@ -13,6 +13,14 @@ import { SerializableState } from '../inline-stream-diff/live-preview.decoration
 
 import { InlineDiffWidget } from './inline-diff-widget';
 
+export interface IDiffPreviewerOptions {
+  disposeWhenEditorClosed: boolean;
+}
+
+export interface IExtendedSerializedState extends SerializableState {
+  readonly options: IDiffPreviewerOptions;
+}
+
 @Injectable({ multiple: true })
 export abstract class BaseInlineDiffPreviewer<N extends IDisposable> extends Disposable {
   @Autowired(INJECTOR_TOKEN)
@@ -22,7 +30,17 @@ export abstract class BaseInlineDiffPreviewer<N extends IDisposable> extends Dis
 
   protected model: ITextModel;
 
-  constructor(protected readonly monacoEditor: ICodeEditor, protected readonly selection: Selection) {
+  get disposeWhenEditorClosed() {
+    return this.options.disposeWhenEditorClosed;
+  }
+
+  constructor(
+    protected readonly monacoEditor: ICodeEditor,
+    protected readonly selection: Selection,
+    public options: IDiffPreviewerOptions = {
+      disposeWhenEditorClosed: true,
+    },
+  ) {
     super();
     this.node = this.createNode();
     this.model = this.monacoEditor.getModel()!;
@@ -226,10 +244,13 @@ export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<InlineStrea
     this.node.addLinesToDiff(content);
     this.onEnd();
   }
-  serializeState(): SerializableState {
-    return this.node.serializeState();
+  serializeState(): IExtendedSerializedState {
+    return {
+      ...this.node.serializeState(),
+      options: this.options,
+    };
   }
-  restoreState(state: SerializableState): void {
+  restoreState(state: IExtendedSerializedState): void {
     this.node.restoreState(state);
   }
   get onPartialEditEvent() {

diff --git a/packages/ai-native/src/browser/widget/inline-diff/inline-diff.handler.ts b/packages/ai-native/src/browser/widget/inline-diff/inline-diff.handler.ts
@@ -20,6 +20,8 @@ import { InlineChatController } from '../inline-chat/inline-chat-controller';
 import { EResultKind } from '../inline-chat/inline-chat.service';
 import {
   BaseInlineDiffPreviewer,
+  IDiffPreviewerOptions,
+  IExtendedSerializedState,
   LiveInlineDiffPreviewer,
   SideBySideInlineDiffWidget,
 } from '../inline-diff/inline-diff-previewer';
@@ -54,7 +56,7 @@ export class InlineDiffHandler extends IAIMonacoContribHandler {
     BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler> | undefined
   >();
 
-  protected _store = new Map<string, SerializableState>();
+  protected _store = new Map<string, IExtendedSerializedState>();
 
   constructor() {
     super();
@@ -85,13 +87,13 @@ export class InlineDiffHandler extends IAIMonacoContribHandler {
     return this.restoreState(monacoEditor, state);
   }
 
-  restoreState(monacoEditor: monaco.ICodeEditor, state: SerializableState) {
+  restoreState(monacoEditor: monaco.ICodeEditor, state: IExtendedSerializedState) {
     const oldDiffPreviewer = this._editorsStore.get(monacoEditor);
     if (oldDiffPreviewer) {
       oldDiffPreviewer.dispose();
     }
 
-    const previewer = this.createDiffPreviewer(monacoEditor, state.selection);
+    const previewer = this.createDiffPreviewer(monacoEditor, state.selection, state.options);
     if (previewer instanceof LiveInlineDiffPreviewer) {
       previewer.restoreState(state);
     }
@@ -142,13 +144,14 @@ export class InlineDiffHandler extends IAIMonacoContribHandler {
     options: {
       crossSelection: monaco.Selection;
       chatResponse?: ChatResponse | InlineChatController;
+      previewerOptions?: IDiffPreviewerOptions;
     },
   ): BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler> {
     const { crossSelection, chatResponse } = options;
 
     const disposable = new Disposable();
 
-    const previewer = this.createDiffPreviewer(monacoEditor, crossSelection);
+    const previewer = this.createDiffPreviewer(monacoEditor, crossSelection, options.previewerOptions);
 
     const onFinish = () => {
       previewer.layout();
@@ -201,17 +204,17 @@ export class InlineDiffHandler extends IAIMonacoContribHandler {
     return previewer;
   }
 
-  createDiffPreviewer(monacoEditor: monaco.ICodeEditor, selection: monaco.Selection) {
+  createDiffPreviewer(monacoEditor: monaco.ICodeEditor, selection: monaco.Selection, options?: IDiffPreviewerOptions) {
     let previewer: BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler>;
 
     const inlineDiffMode = this.preferenceService.getValid<EInlineDiffPreviewMode>(
       AINativeSettingSectionsId.InlineDiffPreviewMode,
       EInlineDiffPreviewMode.inlineLive,
     );
     if (inlineDiffMode === EInlineDiffPreviewMode.sideBySide) {
-      previewer = this.injector.get(SideBySideInlineDiffWidget, [monacoEditor, selection]);
+      previewer = this.injector.get(SideBySideInlineDiffWidget, [monacoEditor, selection, options]);
     } else {
-      previewer = this.injector.get(LiveInlineDiffPreviewer, [monacoEditor, selection]);
+      previewer = this.injector.get(LiveInlineDiffPreviewer, [monacoEditor, selection, options]);
     }
 
     previewer.show(selection.startLineNumber - 1, selection.endLineNumber - selection.startLineNumber + 2);
@@ -278,7 +281,7 @@ export class InlineDiffHandler extends IAIMonacoContribHandler {
     const previewer = this._editorsStore.get(e.payload.group.codeEditor.monacoEditor);
 
     if (previewer) {
-      if (previewer.isModel(uriString)) {
+      if (previewer.disposeWhenEditorClosed && previewer.isModel(uriString)) {
         previewer.dispose();
       }
     }