refactor: merge editor cyrcle deps (#1992)

Aaaaash · Ricbet · commit 9c53d0b1d752 · 2022-12-28T13:52:45.000+08:00
* refactor: merge editor cyrcle deps

* fix: model
diff --git a/packages/core-browser/src/monaco/index.ts b/packages/core-browser/src/monaco/index.ts
@@ -1,5 +1,4 @@
 import { IJSONSchema, Event, IDisposable, BasicEvent } from '@opensumi/ide-core-common';
-import type { IMergeEditorEditor } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/merge-editor-widget';
 import type { ICodeEditor, IDiffEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
 import type { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
 import type { IEditorContribution } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
@@ -16,6 +15,8 @@ import type {
 import type { IStandaloneEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 import type { BrandedService } from '@opensumi/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
 
+import { IMergeEditorEditor } from './merge-editor-widget';
+
 export enum ServiceNames {
   CODE_EDITOR_SERVICE = 'codeEditorService',
   TEXT_MODEL_SERVICE = 'textModelService',
diff --git a/packages/core-browser/src/monaco/merge-editor-widget.ts b/packages/core-browser/src/monaco/merge-editor-widget.ts
@@ -0,0 +1,11 @@
+import type { ICodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import type { IEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
+import type { IEditorModel } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
+
+export interface IMergeEditorEditor extends IEditor {
+  getOursEditor(): ICodeEditor;
+  getResultEditor(): ICodeEditor;
+  getTheirsEditor(): ICodeEditor;
+  open(oursTextModel: IEditorModel, resultTextModel: IEditorModel, theirsTextModel: IEditorModel): Promise<void>;
+  compare(): Promise<void>;
+}
diff --git a/packages/editor/src/browser/workbench-editor.service.ts b/packages/editor/src/browser/workbench-editor.service.ts
@@ -40,7 +40,6 @@ import {
   Disposable,
   makeRandomHexString,
 } from '@opensumi/ide-core-common';
-import { IMergeEditorEditor } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/merge-editor-widget';
 import { IDialogService, IMessageService } from '@opensumi/ide-overlay';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
@@ -91,6 +90,7 @@ import {
   RegisterEditorComponentEvent,
   AskSaveResult,
   IMergeEditorResource,
+  IMergeEditorEditor,
 } from './types';
 import { UntitledDocumentIdCounter } from './untitled-resource';
 
@@ -1644,7 +1644,13 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
         ]);
 
         await this.mergeEditorReady.onceReady(async () => {
-          await this.mergeEditor.open(current, result, incoming);
+          // FIXME: 类型不对
+          // @ts-ignore
+          await this.mergeEditor.open(
+            current.instance.getMonacoModel(),
+            result.instance.getMonacoModel(),
+            incoming.instance.getMonacoModel(),
+          );
         });
       } else {
         return; // other type not handled
diff --git a/packages/monaco-enhance/src/browser/peek-view.ts b/packages/monaco-enhance/src/browser/peek-view.ts
@@ -1,5 +1,4 @@
 import { getExternalIcon } from '@opensumi/ide-core-browser';
-import { IMenu } from '@opensumi/ide-core-browser/lib/menu/next';
 import { Emitter, Disposable } from '@opensumi/ide-core-common';
 import type { ICodeEditor } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
diff --git a/packages/monaco/src/browser/contrib/merge-editor/merge-editor-widget.tsx b/packages/monaco/src/browser/contrib/merge-editor/merge-editor-widget.tsx
@@ -2,15 +2,13 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 
 import { Injectable, Autowired, Injector, INJECTOR_TOKEN } from '@opensumi/di';
-import { AppConfig, ConfigProvider, MonacoService } from '@opensumi/ide-core-browser';
-import { Disposable, Event, IRange, ISelection } from '@opensumi/ide-core-common';
-import { EditorType } from '@opensumi/ide-editor';
-import { IEditorDocumentModelRef } from '@opensumi/ide-editor/lib/browser';
+import { AppConfig, ConfigProvider } from '@opensumi/ide-core-browser';
+import { IMergeEditorEditor } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
+import { Disposable, IRange, ISelection } from '@opensumi/ide-core-common';
 import { Selection } from '@opensumi/monaco-editor-core';
 import { IDisposable } from '@opensumi/monaco-editor-core/esm/vs/base/common/lifecycle';
 import { IDimension } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/dimension';
 import {
-  IEditor,
   IEditorAction,
   IEditorDecorationsCollection,
   IEditorModel,
@@ -26,26 +24,14 @@ import { MergeEditorService } from './merge-editor.service';
 import { Grid } from './view/grid';
 
 export interface IMergeEditorModel {
-  current: ITextModel;
+  ours: ITextModel;
   result: ITextModel;
-  incoming: ITextModel;
+  theirs: ITextModel;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface IMergeEditorEditorConstructionOptions {}
 
-export interface IMergeEditorEditor extends IEditor {
-  getCurrentEditor(): ICodeEditor;
-  getResultEditor(): ICodeEditor;
-  getIncomingEditor(): ICodeEditor;
-  open(
-    currentModelRef: IEditorDocumentModelRef,
-    resultModelRef: IEditorDocumentModelRef,
-    incomingModelRef: IEditorDocumentModelRef,
-  ): Promise<void>;
-  compare(): Promise<void>;
-}
-
 let MERGE_EDITOR_ID = 0;
 
 @Injectable({ multiple: true })
@@ -73,15 +59,11 @@ export class MergeEditorWidget extends Disposable implements IMergeEditorEditor
     this.layout();
   }
 
-  open(
-    currentModelRef: IEditorDocumentModelRef,
-    resultModelRef: IEditorDocumentModelRef,
-    incomingModelRef: IEditorDocumentModelRef,
-  ): Promise<void> {
+  open(oursTextModel: ITextModel, resultTextModel: ITextModel, theirsTextModel: ITextModel): Promise<void> {
     this.setModel({
-      current: currentModelRef.instance.getMonacoModel(),
-      result: resultModelRef.instance.getMonacoModel(),
-      incoming: incomingModelRef.instance.getMonacoModel(),
+      ours: oursTextModel,
+      result: resultTextModel,
+      theirs: theirsTextModel,
     });
 
     this.compare();
@@ -93,15 +75,15 @@ export class MergeEditorWidget extends Disposable implements IMergeEditorEditor
     return this.mergeEditorService.compare();
   }
 
-  getCurrentEditor(): ICodeEditor {
+  getOursEditor(): ICodeEditor {
     return this.mergeEditorService.getCurrentEditor()!;
   }
 
   getResultEditor(): ICodeEditor {
     return this.mergeEditorService.getResultEditor()!;
   }
 
-  getIncomingEditor(): ICodeEditor {
+  getTheirsEditor(): ICodeEditor {
     return this.mergeEditorService.getIncomingEditor()!;
   }
 
@@ -118,7 +100,7 @@ export class MergeEditorWidget extends Disposable implements IMergeEditorEditor
   }
 
   getEditorType(): string {
-    return EditorType.MERGE_EDITOR_DIFF;
+    return 'MERGE_EDITOR_DIFF';
   }
 
   updateOptions(newOptions: IEditorOptions): void {}
@@ -222,10 +204,10 @@ export class MergeEditorWidget extends Disposable implements IMergeEditorEditor
   }
 
   setModel(model: IEditorModel | IMergeEditorModel | null): void {
-    const _model = model as IMergeEditorModel;
-    this.getCurrentEditor().setModel(_model.current);
-    this.getResultEditor().setModel(_model.result);
-    this.getIncomingEditor().setModel(_model.incoming);
+    const mergeModel = model as IMergeEditorModel;
+    this.getOursEditor().setModel(mergeModel.ours);
+    this.getResultEditor().setModel(mergeModel.result);
+    this.getTheirsEditor().setModel(mergeModel.theirs);
   }
 
   createDecorationsCollection(decorations?: IModelDeltaDecoration[]): IEditorDecorationsCollection {
diff --git a/packages/monaco/src/browser/contrib/merge-editor/model/decorations.ts b/packages/monaco/src/browser/contrib/merge-editor/model/decorations.ts
@@ -6,8 +6,8 @@ import { IModelDecorationsChangedEvent } from '@opensumi/monaco-editor-core/esm/
 
 import { ICodeEditor, IModelDeltaDecoration } from '../../../monaco-api/editor';
 import { LineRangeType } from '../types';
+import { GuidelineWidget } from '../view/guideline-widget';
 
-import { GuidelineWidget } from './line';
 import { LineRange } from './line-range';
 
 export interface IRenderChangesInput {
@@ -92,7 +92,7 @@ export class MergeEditorDecorations extends Disposable {
     this.editor.changeDecorations((accessor) => {
       const newDecorations: IDiffDecoration[] = this.retainDecoration;
       this.retainLineWidgetSet.forEach((widget) => {
-        widget.showByLine(widget.currentRange.startLineNumber);
+        widget.showByLine(widget.position?.lineNumber!);
         this.lineWidgetSet.add(widget);
       });
 
diff --git a/packages/monaco/src/browser/contrib/merge-editor/view/editors/baseCodeEditor.ts b/packages/monaco/src/browser/contrib/merge-editor/view/editors/baseCodeEditor.ts
@@ -14,9 +14,9 @@ import {
   IRenderInnerChangesInput,
   MergeEditorDecorations,
 } from '../../model/decorations';
-import { GuidelineWidget } from '../../model/line';
 import { LineRange } from '../../model/line-range';
 import { flatModified, flatOriginal } from '../../utils';
+import { GuidelineWidget } from '../guideline-widget';
 
 export abstract class BaseCodeEditor extends Disposable {
   protected decorations: MergeEditorDecorations;
diff --git a/packages/monaco/src/browser/contrib/merge-editor/view/editors/currentCodeEditor.tsx b/packages/monaco/src/browser/contrib/merge-editor/view/editors/currentCodeEditor.tsx
@@ -4,9 +4,9 @@ import { LineRangeMapping } from '@opensumi/monaco-editor-core/esm/vs/editor/com
 import { IStandaloneEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 
 import { IDiffDecoration, IRenderChangesInput, IRenderInnerChangesInput } from '../../model/decorations';
-import { GuidelineWidget } from '../../model/line';
 import { LineRange } from '../../model/line-range';
 import { flatInnerOriginal, flatModified, flatOriginal } from '../../utils';
+import { GuidelineWidget } from '../guideline-widget';
 
 import { BaseCodeEditor } from './baseCodeEditor';
 
diff --git a/packages/monaco/src/browser/contrib/merge-editor/view/editors/incomingCodeEditor.tsx b/packages/monaco/src/browser/contrib/merge-editor/view/editors/incomingCodeEditor.tsx
@@ -9,9 +9,9 @@ import {
   IRenderInnerChangesInput,
   MergeEditorDecorations,
 } from '../../model/decorations';
-import { GuidelineWidget } from '../../model/line';
 import { LineRange } from '../../model/line-range';
 import { flatInnerModified, flatModified, flatOriginal, flatInnerOriginal } from '../../utils';
+import { GuidelineWidget } from '../guideline-widget';
 
 import { BaseCodeEditor } from './baseCodeEditor';
 
diff --git a/packages/monaco/src/browser/contrib/merge-editor/view/editors/resultCodeEditor.tsx b/packages/monaco/src/browser/contrib/merge-editor/view/editors/resultCodeEditor.tsx
@@ -9,9 +9,9 @@ import {
   IRenderInnerChangesInput,
   MergeEditorDecorations,
 } from '../../model/decorations';
-import { GuidelineWidget } from '../../model/line';
 import { LineRange } from '../../model/line-range';
 import { flatInnerModified, flatModified, flatOriginal, flatInnerOriginal } from '../../utils';
+import { GuidelineWidget } from '../guideline-widget';
 
 import { BaseCodeEditor } from './baseCodeEditor';
 
diff --git a/packages/monaco/src/browser/contrib/merge-editor/view/guideline-widget.ts b/packages/monaco/src/browser/contrib/merge-editor/view/guideline-widget.ts
@@ -1,6 +1,5 @@
-import { ZoneWidget } from '@opensumi/ide-monaco-enhance';
+import { ZoneWidget } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/zoneWidget/browser/zoneWidget';
 
-import { ICodeEditor } from '../../../monaco-api/types';
 import { LineRangeType } from '../types';
 
 export class GuidelineWidget extends ZoneWidget {
@@ -14,8 +13,8 @@ export class GuidelineWidget extends ZoneWidget {
   public setContainerStyle(style: { [key in string]: string }): void {
     const keys = Object.keys(style);
     for (const key of keys) {
-      if (Object.prototype.hasOwnProperty.call(this._container.style, key)) {
-        this._container.style[key] = style[key];
+      if (Object.prototype.hasOwnProperty.call(this.container?.style, key)) {
+        this.container!.style[key] = style[key];
       }
     }
   }
diff --git a/packages/monaco/src/browser/monaco.service.ts b/packages/monaco/src/browser/monaco.service.ts
@@ -6,6 +6,7 @@ import {
   ServiceNames,
   ILogger,
 } from '@opensumi/ide-core-browser';
+import { IMergeEditorEditor } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
 import { SimpleKeybinding } from '@opensumi/monaco-editor-core/esm/vs/base/common/keybindings';
 import { IDisposable } from '@opensumi/monaco-editor-core/esm/vs/base/common/lifecycle';
 import { IEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/config/editorConfiguration';
@@ -16,7 +17,7 @@ import { IStandaloneEditorConstructionOptions } from '@opensumi/monaco-editor-co
 
 import { MonacoService } from '../common';
 
-import { IMergeEditorEditor, MergeEditorWidget } from './contrib/merge-editor/merge-editor-widget';
+import { MergeEditorWidget } from './contrib/merge-editor/merge-editor-widget';
 import { ITextmateTokenizer, ITextmateTokenizerService } from './contrib/tokenizer';
 import { monaco } from './monaco-api';
 import { ICodeEditor, IDiffEditor } from './monaco-api/types';

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { getExternalIcon } from '@opensumi/ide-core-browser';`
`2`		`-import { IMenu } from '@opensumi/ide-core-browser/lib/menu/next';`
`3`	`2`	`import { Emitter, Disposable } from '@opensumi/ide-core-common';`
`4`	`3`	`import type { ICodeEditor } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';`
`5`	`4`