feat: optimize merge conflict

packages/ai-native/src/browser/ai-editor.contribution.ts

@@ -43,7 +43,7 @@ import { AINativeCoreContribution, IAIMiddleware } from './types';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
 import { AIInlineChatService, EInlineChatStatus } from './widget/inline-chat/inline-chat.service';
 import { AIInlineContentWidget } from './widget/inline-chat/inline-content-widget';
-import { AIDiffWidget } from './widget/inline-diff/inline-diff-widget';
+import { InlineDiffWidget } from './widget/inline-diff/inline-diff-widget';
 
 @Injectable()
 export class AIEditorContribution extends Disposable implements IEditorFeatureContribution {
@@ -105,7 +105,7 @@ export class AIEditorContribution extends Disposable implements IEditorFeatureCo
     this.logger = this.loggerManagerClient.getLogger(SupportLogNamespace.Browser);
   }
 
-  private aiDiffWidget: AIDiffWidget;
+  private aiDiffWidget: InlineDiffWidget;
   private aiInlineContentWidget: AIInlineContentWidget;
   private aiInlineChatDisposed: Disposable = new Disposable();
   private aiInlineChatOperationDisposed: Disposable = new Disposable();
@@ -453,7 +453,7 @@ export class AIEditorContribution extends Disposable implements IEditorFeatureCo
       this.aiInlineChatService.onThumbs((isLike: boolean) => {
         this.aiReporter.end(relationId, { isLike });
       }),
-      this.aiDiffWidget.onMaxLincCount((count) => {
+      this.aiDiffWidget.onMaxLineCount((count) => {
         requestAnimationFrame(() => {
           if (crossSelection.endLineNumber === model!.getLineCount()) {
             const lineHeight = monacoEditor.getOption(monacoApi.editor.EditorOption.lineHeight);
@@ -487,8 +487,8 @@ export class AIEditorContribution extends Disposable implements IEditorFeatureCo
   }
 
   private visibleDiffWidget(monacoEditor: monaco.ICodeEditor, crossSelection: monaco.Selection, answer: string): void {
-    monacoEditor.setHiddenAreas([crossSelection], AIDiffWidget._hideId);
-    this.aiDiffWidget = this.injector.get(AIDiffWidget, [monacoEditor, crossSelection, answer]);
+    monacoEditor.setHiddenAreas([crossSelection], InlineDiffWidget._hideId);
+    this.aiDiffWidget = this.injector.get(InlineDiffWidget, [monacoEditor, crossSelection, answer]);
     this.aiDiffWidget.create();
     this.aiDiffWidget.showByLine(
       crossSelection.startLineNumber - 1,