Merge remote-tracking branch 'origin/v3.2'

Author: Ricbet

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.2.0"
+  "version": "3.2.1"
 }

packages/addons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-addons",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "files": [
     "lib",
     "src"

packages/ai-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "files": [
     "lib",
     "src"

packages/ai-native/src/browser/widget/inline-chat/inline-chat.handler.ts

@@ -83,6 +83,7 @@ export class InlineChatHandler extends Disposable {
     );
 
     this.inlineChatInUsing = false;
+    this.cancelToken();
   }
 
   protected inlineChatInUsing = false;

packages/ai-native/src/browser/widget/inline-diff/inline-diff-previewer.ts

@@ -87,8 +87,6 @@ export abstract class BaseInlineDiffPreviewer<N extends IDisposable> extends Dis
 
   public mount(contentWidget: AIInlineContentWidget): void {
     this.inlineContentWidget = contentWidget;
-
-    this.inlineContentWidget.addDispose(this);
   }
 
   public layout(): void {
@@ -157,6 +155,10 @@ export class SideBySideInlineDiffWidget extends BaseInlineDiffPreviewer<InlineDi
     this.addDispose(widget);
     return widget;
   }
+  mount(contentWidget: AIInlineContentWidget): void {
+    super.mount(contentWidget);
+    contentWidget.addDispose(this);
+  }
   getPosition(): IPosition {
     return Position.lift({ lineNumber: this.selection.endLineNumber + 1, column: 1 });
   }

packages/ai-native/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx

@@ -392,6 +392,10 @@ export class InlineStreamDiffHandler extends Disposable {
       this.isEditing = true;
 
       while (this.currentEditLine <= this.virtualModel.getLinesContent().length) {
+        if (this.disposed) {
+          return;
+        }
+
         const virtualTextLines = this.virtualModel.getLinesContent();
         const currentText = virtualTextLines.slice(0, this.currentEditLine);
         const currentDiffModel = this.computeDiff(this.rawOriginalTextLines, currentText);

packages/collaboration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-collaboration",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "files": [
     "lib",
     "src"

packages/comments/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-comments",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "files": [
     "lib",
     "src"

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-components",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "@opensumi/ide-components",
   "license": "MIT",
   "main": "lib/index.js",

packages/connection/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-connection",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "files": [
     "lib",
     "src"