@opensumi/ide-editor 2.21.13 → 2.22.0

package/lib/browser/doc-model/saveParticipants.d.ts

@@ -1,13 +1,13 @@
-import { ClientAppContribution, WithEventBus, PreferenceService, CommandService, MonacoService, ILogger } from '@opensumi/ide-core-browser';
-import { EditorDocumentModelWillSaveEvent, IEditorDocumentModelService } from './types';
+import { ClientAppContribution, WithEventBus } from '@opensumi/ide-core-browser';
+import { EditorDocumentModelWillSaveEvent } from './types';
 export declare class CodeActionOnSaveParticipant extends WithEventBus {
-    preferenceService: PreferenceService;
-    monacoService: MonacoService;
+    private readonly preferenceService;
     private readonly overrideServiceRegistry;
+    private readonly commandService;
+    private readonly docService;
+    private readonly logger;
+    private readonly progressService;
     get bulkEditService(): any;
-    commandService: CommandService;
-    docService: IEditorDocumentModelService;
-    logger: ILogger;
     activate(): void;
     onEditorDocumentModelWillSave(e: EditorDocumentModelWillSaveEvent): Promise<void>;
     private applyOnSaveActions;

package/lib/browser/doc-model/saveParticipants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,YAAY,EAGZ,iBAAiB,EACjB,cAAc,EACd,aAAa,EAEb,OAAO,EAGR,MAAM,4BAA4B,CAAC;AAiBpC,OAAO,EAAE,gCAAgC,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAExF,qBACa,2BAA4B,SAAQ,YAAY;IAE3D,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,aAAa,EAAE,aAAa,CAAC;IAG7B,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAExE,IAAI,eAAe,IAAI,GAAG,CAEzB;IAGD,cAAc,EAAE,cAAc,CAAC;IAG/B,UAAU,EAAE,2BAA2B,CAAC;IAGxC,MAAM,EAAE,OAAO,CAAC;IAEhB,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;YA8DzD,kBAAkB;YAYlB,gBAAgB;YAchB,eAAe;CAc9B;AAED,qBACa,4BAA6B,YAAW,qBAAqB;IAExE,2BAA2B,EAAE,2BAA2B,CAAC;IAEzD,OAAO;CAGR"}
+{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,YAAY,EAYb,MAAM,4BAA4B,CAAC;AAmBpC,OAAO,EAAE,gCAAgC,EAA+B,MAAM,SAAS,CAAC;AAExF,qBACa,2BAA4B,SAAQ,YAAY;IAE3D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAGxE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAEnD,IAAI,eAAe,IAAI,GAAG,CAEzB;IAED,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;YAkFzD,kBAAkB;YAmClB,gBAAgB;YAchB,eAAe;CAoB9B;AAED,qBACa,4BAA6B,YAAW,qBAAqB;IAExE,2BAA2B,EAAE,2BAA2B,CAAC;IAEzD,OAAO;CAGR"}

package/lib/browser/doc-model/saveParticipants.js

@@ -4,6 +4,7 @@ exports.SaveParticipantsContribution = exports.CodeActionOnSaveParticipant = voi
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
+const progress_1 = require("@opensumi/ide-core-browser/lib/progress");
 const monaco_api_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api");
 const languages_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api/languages");
 const languages = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/common/languages"));
@@ -28,44 +29,74 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends ide_
         if (!preferenceActions) {
             return undefined;
         }
-        const codeActionsOnSave = [];
-        for (const k of Object.keys(preferenceActions).map((p) => new types_1.CodeActionKind(p))) {
-            // source.fixAll
-            // source.fixAll.eslint
-            // source.fixAll.stylelint
-            if (types_1.CodeActionKind.SourceFixAll.equals(k) || types_1.CodeActionKind.SourceFixAll.contains(k)) {
-                codeActionsOnSave.push(types_1.CodeActionKind.SourceFixAll);
+        return this.progressService.withProgress({
+            title: (0, ide_core_browser_1.formatLocalize)('editor.saveCodeActions.saving', e.payload.uri.displayName),
+            location: ide_core_browser_1.ProgressLocation.Notification,
+            cancellable: true,
+        }, async (progress) => {
+            const codeActions = Array.isArray(preferenceActions) ? preferenceActions : Object.keys(preferenceActions);
+            const codeActionsOnSave = codeActions.map((p) => new types_1.CodeActionKind(p));
+            if (!Array.isArray(preferenceActions)) {
+                codeActionsOnSave.sort((a, b) => {
+                    if (types_1.CodeActionKind.SourceFixAll.contains(a)) {
+                        if (types_1.CodeActionKind.SourceFixAll.contains(b)) {
+                            return 0;
+                        }
+                        return -1;
+                    }
+                    if (types_1.CodeActionKind.SourceFixAll.contains(b)) {
+                        return 1;
+                    }
+                    return 0;
+                });
             }
-            // source.organizeImports
-            if (types_1.CodeActionKind.SourceOrganizeImports.equals(k)) {
-                codeActionsOnSave.push(types_1.CodeActionKind.SourceOrganizeImports);
+            if (codeActionsOnSave.length === 0) {
+                return;
             }
-        }
-        if (codeActionsOnSave.length === 0) {
-            return;
-        }
-        const modelRef = this.docService.getModelReference(e.payload.uri, 'codeActionOnSave');
-        if (!modelRef) {
-            return;
-        }
-        const model = modelRef.instance.getMonacoModel();
-        const tokenSource = new monaco.CancellationTokenSource();
-        const timeout = this.preferenceService.get('editor.codeActionsOnSaveTimeout', undefined, e.payload.uri.toString(), e.payload.language);
-        return Promise.race([
-            new Promise((_resolve, reject) => setTimeout(() => {
+            const modelRef = this.docService.getModelReference(e.payload.uri, 'codeActionOnSave');
+            if (!modelRef) {
+                return;
+            }
+            const model = modelRef.instance.getMonacoModel();
+            const tokenSource = new monaco.CancellationTokenSource();
+            const timeout = this.preferenceService.get('editor.codeActionsOnSaveTimeout', undefined, e.payload.uri.toString(), e.payload.language);
+            const excludedActions = Array.isArray(preferenceActions)
+                ? []
+                : Object.keys(preferenceActions)
+                    .filter((x) => preferenceActions[x] === false)
+                    .map((x) => new types_1.CodeActionKind(x));
+            return Promise.race([
+                new Promise((_resolve, reject) => setTimeout(() => {
+                    tokenSource.cancel();
+                    reject('codeActionsOnSave timeout');
+                }, timeout)),
+                this.applyOnSaveActions(model, codeActionsOnSave, excludedActions, progress, tokenSource.token),
+            ]).finally(() => {
                 tokenSource.cancel();
-                reject('codeActionsOnSave timeout');
-            }, timeout)),
-            this.applyOnSaveActions(model, codeActionsOnSave, tokenSource.token),
-        ]).finally(() => {
-            tokenSource.cancel();
-            modelRef.dispose();
+                modelRef.dispose();
+            });
         });
     }
-    async applyOnSaveActions(model, actions, token) {
+    async applyOnSaveActions(model, actions, excludes, progress, token) {
+        const getActionProgress = new (class {
+            constructor() {
+                this._names = new Set();
+            }
+            _report() {
+                progress.report({
+                    message: (0, ide_core_browser_1.formatLocalize)('editor.saveCodeActions.getting', [...this._names].map((name) => `'${name}'`).join(', ')),
+                });
+            }
+            report(provider) {
+                if (provider.displayName && !this._names.has(provider.displayName)) {
+                    this._names.add(provider.displayName);
+                    this._report();
+                }
+            }
+        })();
         for (const codeActionKind of actions) {
             try {
-                const actionsToRun = await this.getActionsToRun(model, codeActionKind, token);
+                const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, getActionProgress, token);
                 await this.applyCodeActions(actionsToRun.validActions);
             }
             catch (e) {
@@ -84,22 +115,18 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends ide_
             }
         }
     }
-    async getActionsToRun(model, codeActionKind, token) {
+    async getActionsToRun(model, codeActionKind, excludes, progress, token) {
         return (0, codeAction_1.getCodeActions)(languages_1.languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), {
             type: languages.CodeActionTriggerType.Auto,
-            filter: { include: codeActionKind, includeSourceActions: true },
+            filter: { include: codeActionKind, excludes, includeSourceActions: true },
             triggerAction: types_1.CodeActionTriggerSource.OnSave,
-        }, ide_core_browser_1.Progress.None, token);
+        }, progress, token);
     }
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
     tslib_1.__metadata("design:type", Object)
 ], CodeActionOnSaveParticipant.prototype, "preferenceService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_browser_1.MonacoService),
-    tslib_1.__metadata("design:type", ide_core_browser_1.MonacoService)
-], CodeActionOnSaveParticipant.prototype, "monacoService", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.MonacoOverrideServiceRegistry),
     tslib_1.__metadata("design:type", ide_core_browser_1.MonacoOverrideServiceRegistry)
@@ -116,6 +143,10 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.ILogger),
     tslib_1.__metadata("design:type", Object)
 ], CodeActionOnSaveParticipant.prototype, "logger", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(progress_1.IProgressService),
+    tslib_1.__metadata("design:type", Object)
+], CodeActionOnSaveParticipant.prototype, "progressService", void 0);
 tslib_1.__decorate([
     (0, ide_core_browser_1.OnEvent)(types_3.EditorDocumentModelWillSaveEvent),
     tslib_1.__metadata("design:type", Function),

package/lib/browser/doc-model/saveParticipants.js.map

@@ -1 +1 @@
-{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"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"}

package/lib/browser/doc-model/types.d.ts

@@ -153,7 +153,7 @@ export interface IPreferredModelOptions {
     languageId?: string;
     eol?: EOL;
 }
-export declare type IEditorDocumentModelRef = IRef<IEditorDocumentModel>;
+export type IEditorDocumentModelRef = IRef<IEditorDocumentModel>;
 export interface IEditorDocumentModelService {
     hasLanguage(languageId: string): boolean;
     createModelReference(uri: URI, reason?: string): Promise<IEditorDocumentModelRef>;

package/lib/browser/doc-model/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,YAAY,EACZ,IAAI,EACJ,WAAW,EACX,KAAK,EACL,MAAM,EACN,UAAU,EACV,cAAc,EACd,qBAAqB,EACrB,8BAA8B,EAC/B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AACvG,OAAO,KAAK,MAAM,MAAM,uDAAuD,CAAC;AAEhF,OAAO,EAAE,iCAAiC,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEjC;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,cAAc,IAAI,UAAU,CAAC;IAE7B;;;OAGG;IACH,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE7D;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3C,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEhC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAEhD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAIhD,aAAa,CAAC,OAAO,EAAE,sBAAsB,OAAE;CAChD;AAED,MAAM,WAAW,sBAAuB,SAAQ,MAAM,CAAC,MAAM,CAAC,uBAAuB;IACnF,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,mCAAmC;IAClD;;;;OAIG;IACH,aAAa,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEtD;;;OAGG;IACH,UAAU,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAE5C;;;;OAIG;IACH,iCAAiC,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAErF;;;OAGG;IACH,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAE5C;;;;;;;OAOG;IACH,iBAAiB,CAAC,CAChB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,qBAAqB,EAAE,EAChC,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,OAAO,EACpB,GAAG,CAAC,EAAE,GAAG,GACR,YAAY,CAAC,8BAA8B,CAAC,CAAC;IAEhD;;;OAGG;IACH,oBAAoB,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAElE,UAAU,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAEzC;;;OAGG;IACH,eAAe,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAEjD;;;OAGG;IACH,oCAAoC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAErG;;OAEG;IACH,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/B,iBAAiB,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC;IAEnC;;;OAGG;IACH,aAAa,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEhD;;OAEG;IACH,aAAa,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEhD;;OAEG;IACH,aAAa,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEtD;;OAEG;IACH,gBAAgB,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAED,oBAAY,uBAAuB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAEjE,MAAM,WAAW,2BAA2B;IAC1C,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;IAEzC,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAElF;;;OAGG;IACH,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,uBAAuB,GAAG,IAAI,CAAC;IAE7E;;OAEG;IACH,YAAY,IAAI,oBAAoB,EAAE,CAAC;IAEvC;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,sBAAsB,OAAE;IAE9D,uBAAuB,CACrB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,qBAAqB,EAAE,EAChC,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,OAAO,GACnB,YAAY,CAAC,8BAA8B,CAAC,CAAC;CACjD;AAED,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF,MAAM,WAAW,mCAAmC;IAClD;;;OAGG;IACH,0CAA0C,CAAC,QAAQ,EAAE,mCAAmC,GAAG,WAAW,CAAC;IAEvG,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,mCAAmC,GAAG,SAAS,CAAC,CAAC;IAEhF,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChE;AAED,eAAO,MAAM,mCAAmC,eAAgD,CAAC;AAIjG,qBAAa,sCAAuC,SAAQ,UAAU,CAAC,8CAA8C,CAAC;CAAG;AAEzH,MAAM,WAAW,8CAA8C;IAC7D,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,iCAAiC,EAAE,CAAC;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,qBAAa,qCAAsC,SAAQ,UAAU,CAAC,6CAA6C,CAAC;CAAG;AAEvH,qBAAa,6CAA8C,SAAQ,UAAU,CAAC,GAAG,CAAC;CAAG;AAErF,MAAM,WAAW,6CAA6C;IAC5D,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAED,qBAAa,gCAAiC,SAAQ,UAAU,CAAC,wCAAwC,CAAC;CAAG;AAE7G,MAAM,WAAW,wCAAwC;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,+BAAgC,SAAQ,UAAU,CAAC,GAAG,CAAC;CAAG;AAEvE,qBAAa,6BAA8B,SAAQ,UAAU,CAAC,GAAG,CAAC;CAAG;AAErE,qBAAa,gCAAiC,SAAQ,UAAU,CAAC;IAC/D,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;CAAG;AACL,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,gBAAgB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC9C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,EAAE,CAAC;IACxC,gBAAgB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IACrC,cAAc,EAAE,MAAM,CAAC;IAEvB,cAAc,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,cAAc,EAAE,CAAA;KAAE,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACrD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,gBAAgB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;IAEvB,GAAG,EAAE,iBAAiB,CAAC;CACxB;AAGD,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,0BAAkB,YAAY;IAC5B;;OAEG;IACH,MAAM,IAAA;IAEN;;OAEG;IACH,MAAM,IAAA;CACP"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/types.ts"],"names":[],"mappings":"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"}

package/lib/browser/editor-collection.service.d.ts

@@ -1,5 +1,6 @@
 import { Injector } from '@opensumi/di';
-import { IRange, MonacoService, IContextKeyService } from '@opensumi/ide-core-browser';
+import { IRange, IContextKeyService } from '@opensumi/ide-core-browser';
+import { MonacoService } from '@opensumi/ide-core-browser/lib/monaco';
 import { ILineChange, URI, WithEventBus, Disposable } from '@opensumi/ide-core-common';
 import type { ICodeEditor as IMonacoCodeEditor, IDiffEditor as IMonacoDiffEditor } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
@@ -33,12 +34,15 @@ export declare class EditorCollectionServiceImpl extends WithEventBus implements
     createDiffEditor(dom: HTMLElement, options?: any, overrides?: {
         [key: string]: any;
     }): IDiffEditor;
+    createMergeEditor(dom: HTMLElement, options?: any, overrides?: {
+        [key: string]: any;
+    }): import("@opensumi/ide-core-browser/lib/monaco/merge-editor-widget").IMergeEditorEditor;
     listDiffEditors(): IDiffEditor[];
     addDiffEditors(diffEditors: IDiffEditor[]): void;
     removeDiffEditors(diffEditors: IDiffEditor[]): void;
     onDocModelContentChangedEvent(e: EditorDocumentModelContentChangedEvent): void;
 }
-export declare type IMonacoImplEditor = IEditor;
+export type IMonacoImplEditor = IEditor;
 export declare function insertSnippetWithMonacoEditor(editor: IMonacoCodeEditor, template: string, ranges: IRange[], opts: IUndoStopOptions): void;
 export declare abstract class BaseMonacoEditorWrapper extends Disposable implements IEditor {
     readonly monacoEditor: IMonacoCodeEditor;
@@ -60,6 +64,7 @@ export declare abstract class BaseMonacoEditorWrapper extends Disposable impleme
     protected enableSelectionEmitter(): void;
     private injector;
     constructor(monacoEditor: IMonacoCodeEditor, type: EditorType);
+    private onDidChangeModel;
     getType(): EditorType;
     updateOptions(editorOptions?: monaco.editor.IEditorOptions, modelOptions?: monaco.editor.ITextModelUpdateOptions): void;
     private _doUpdateOptions;
@@ -100,7 +105,7 @@ export declare class BrowserCodeEditor extends BaseMonacoEditorWrapper implement
     dispose(): void;
     protected saveCurrentState(): void;
     protected restoreState(): void;
-    open(documentModelRef: IEditorDocumentModelRef): Promise<void>;
+    open(documentModelRef: IEditorDocumentModelRef): void;
 }
 export declare class BrowserDiffEditor extends Disposable implements IDiffEditor {
     readonly monacoDiffEditor: IMonacoDiffEditor;

package/lib/browser/editor-collection.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-collection.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"editor-collection.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"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"}

package/lib/browser/editor-collection.service.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const contextkey_1 = require("@opensumi/ide-core-browser/lib/contextkey");
+const monaco_1 = require("@opensumi/ide-core-browser/lib/monaco");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
 const ide_core_common_2 = require("@opensumi/ide-core-common");
 const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
@@ -17,6 +18,9 @@ const converter_1 = require("./preference/converter");
 const types_2 = require("./types");
 const { removeUndefined } = ide_core_common_1.objects;
 let EditorCollectionServiceImpl = class EditorCollectionServiceImpl extends ide_core_common_1.WithEventBus {
+    get currentEditor() {
+        return this._currentEditor;
+    }
     constructor() {
         super();
         this._editors = new Set();
@@ -31,9 +35,6 @@ let EditorCollectionServiceImpl = class EditorCollectionServiceImpl extends ide_
             });
         }));
     }
-    get currentEditor() {
-        return this._currentEditor;
-    }
     createCodeEditor(dom, options, overrides) {
         const mergedOptions = Object.assign(Object.assign({}, (0, converter_1.getConvertedMonacoOptions)(this.configurationService).editorOptions), options);
         const monacoCodeEditor = this.monacoService.createCodeEditor(dom, mergedOptions, overrides);
@@ -82,6 +83,12 @@ let EditorCollectionServiceImpl = class EditorCollectionServiceImpl extends ide_
         this._onDiffEditorCreate.fire(editor);
         return editor;
     }
+    createMergeEditor(dom, options, overrides) {
+        const preferenceOptions = (0, converter_1.getConvertedMonacoOptions)(this.configurationService);
+        const mergedOptions = Object.assign(Object.assign(Object.assign({}, preferenceOptions.editorOptions), preferenceOptions.diffOptions), options);
+        const editor = this.monacoService.createMergeEditor(dom, mergedOptions, overrides);
+        return editor;
+    }
     listDiffEditors() {
         return Array.from(this._diffEditors.values());
     }
@@ -117,7 +124,7 @@ let EditorCollectionServiceImpl = class EditorCollectionServiceImpl extends ide_
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(),
-    tslib_1.__metadata("design:type", ide_core_browser_1.MonacoService)
+    tslib_1.__metadata("design:type", monaco_1.MonacoService)
 ], EditorCollectionServiceImpl.prototype, "monacoService", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
@@ -161,6 +168,21 @@ function updateOptionsWithMonacoEditor(monacoEditor, editorOptions, modelOptions
     }
 }
 let BaseMonacoEditorWrapper = class BaseMonacoEditorWrapper extends ide_core_common_1.Disposable {
+    get currentUri() {
+        return this.currentDocumentModel ? this.currentDocumentModel.uri : null;
+    }
+    getId() {
+        return this.monacoEditor.getId();
+    }
+    getSelections() {
+        return this.monacoEditor.getSelections() || [];
+    }
+    disableSelectionEmitter() {
+        this._disableSelectionEmitter = true;
+    }
+    enableSelectionEmitter() {
+        this._disableSelectionEmitter = false;
+    }
     constructor(monacoEditor, type) {
         super();
         this.monacoEditor = monacoEditor;
@@ -172,22 +194,7 @@ let BaseMonacoEditorWrapper = class BaseMonacoEditorWrapper extends ide_core_com
         this._editorOptionsFromContribution = {};
         this._disableSelectionEmitter = false;
         this.decorationApplier = this.injector.get(decoration_applier_1.MonacoEditorDecorationApplier, [this.monacoEditor]);
-        this.addDispose(this.monacoEditor.onDidChangeModel(() => {
-            this._editorOptionsFromContribution = {};
-            const uri = this.currentUri;
-            if (uri) {
-                Promise.resolve(this.editorFeatureRegistry.runProvideEditorOptionsForUri(uri)).then((option) => {
-                    if (!this.currentUri || !uri.isEqual(this.currentUri)) {
-                        return; // uri可能已经变了
-                    }
-                    if (option && Object.keys(option).length > 0) {
-                        this._editorOptionsFromContribution = option;
-                        this._doUpdateOptions();
-                    }
-                });
-            }
-            this._doUpdateOptions();
-        }));
+        this.addDispose(this.monacoEditor.onDidChangeModel(this.onDidChangeModel.bind(this)));
         this.addDispose(this.monacoEditor.onDidChangeModelLanguage(() => {
             this._doUpdateOptions();
         }));
@@ -198,20 +205,22 @@ let BaseMonacoEditorWrapper = class BaseMonacoEditorWrapper extends ide_core_com
             }
         }));
     }
-    get currentUri() {
-        return this.currentDocumentModel ? this.currentDocumentModel.uri : null;
-    }
-    getId() {
-        return this.monacoEditor.getId();
-    }
-    getSelections() {
-        return this.monacoEditor.getSelections() || [];
-    }
-    disableSelectionEmitter() {
-        this._disableSelectionEmitter = true;
-    }
-    enableSelectionEmitter() {
-        this._disableSelectionEmitter = false;
+    async onDidChangeModel() {
+        this._editorOptionsFromContribution = {};
+        const uri = this.currentUri;
+        if (uri) {
+            Promise.resolve(this.editorFeatureRegistry.runProvideEditorOptionsForUri(uri)).then((options) => {
+                if (!this.currentUri || !uri.isEqual(this.currentUri)) {
+                    return; // uri可能已经变了
+                }
+                if (options && Object.keys(options).length > 0) {
+                    this._editorOptionsFromContribution = options;
+                    if (!(0, ide_core_common_1.isEmptyObject)(this._editorOptionsFromContribution)) {
+                        this._doUpdateOptions();
+                    }
+                }
+            });
+        }
     }
     getType() {
         return this.type;
@@ -304,10 +313,21 @@ tslib_1.__decorate([
 ], BaseMonacoEditorWrapper.prototype, "injector", void 0);
 BaseMonacoEditorWrapper = tslib_1.__decorate([
     (0, di_1.Injectable)({ multiple: true }),
-    tslib_1.__metadata("design:paramtypes", [Object, Number])
+    tslib_1.__metadata("design:paramtypes", [Object, Object])
 ], BaseMonacoEditorWrapper);
 exports.BaseMonacoEditorWrapper = BaseMonacoEditorWrapper;
 class BrowserCodeEditor extends BaseMonacoEditorWrapper {
+    get currentDocumentModel() {
+        if (this._currentDocumentModelRef && !this._currentDocumentModelRef.disposed) {
+            return this._currentDocumentModelRef.instance;
+        }
+        else {
+            return null;
+        }
+    }
+    getType() {
+        return common_1.EditorType.CODE;
+    }
     constructor(monacoEditor, options = {}) {
         super(monacoEditor, common_1.EditorType.CODE);
         this.monacoEditor = monacoEditor;
@@ -341,17 +361,6 @@ class BrowserCodeEditor extends BaseMonacoEditorWrapper {
             },
         });
     }
-    get currentDocumentModel() {
-        if (this._currentDocumentModelRef && !this._currentDocumentModelRef.disposed) {
-            return this._currentDocumentModelRef.instance;
-        }
-        else {
-            return null;
-        }
-    }
-    getType() {
-        return common_1.EditorType.CODE;
-    }
     layout() {
         this.monacoEditor.layout();
     }
@@ -381,7 +390,7 @@ class BrowserCodeEditor extends BaseMonacoEditorWrapper {
             }
         }
     }
-    async open(documentModelRef) {
+    open(documentModelRef) {
         this.saveCurrentState();
         this._currentDocumentModelRef = documentModelRef;
         const model = this.currentDocumentModel.getMonacoModel();
@@ -407,19 +416,6 @@ tslib_1.__decorate([
 ], BrowserCodeEditor.prototype, "editorFeatureRegistry", void 0);
 exports.BrowserCodeEditor = BrowserCodeEditor;
 class BrowserDiffEditor extends ide_core_common_1.Disposable {
-    constructor(monacoDiffEditor, specialOptions = {}) {
-        super();
-        this.monacoDiffEditor = monacoDiffEditor;
-        this.specialOptions = specialOptions;
-        this.editorState = new Map();
-        this.wrapEditors();
-        this.addDispose(this.configurationService.onDidChangeConfiguration((e) => {
-            const changedEditorKeys = e.affectedKeys.filter((key) => (0, converter_1.isDiffEditorOption)(key));
-            if (changedEditorKeys.length > 0) {
-                this.doUpdateDiffOptions();
-            }
-        }));
-    }
     get originalDocModel() {
         if (this.originalDocModelRef && !this.originalDocModelRef.disposed) {
             return this.originalDocModelRef.instance;
@@ -448,6 +444,19 @@ class BrowserDiffEditor extends ide_core_common_1.Disposable {
             }
         }
     }
+    constructor(monacoDiffEditor, specialOptions = {}) {
+        super();
+        this.monacoDiffEditor = monacoDiffEditor;
+        this.specialOptions = specialOptions;
+        this.editorState = new Map();
+        this.wrapEditors();
+        this.addDispose(this.configurationService.onDidChangeConfiguration((e) => {
+            const changedEditorKeys = e.affectedKeys.filter((key) => (0, converter_1.isDiffEditorOption)(key));
+            if (changedEditorKeys.length > 0) {
+                this.doUpdateDiffOptions();
+            }
+        }));
+    }
     async compare(originalDocModelRef, modifiedDocModelRef, options = {}, rawUri) {
         this.saveCurrentState(); // 保存上一个状态
         this.originalDocModelRef = originalDocModelRef;
@@ -541,7 +550,7 @@ class BrowserDiffEditor extends ide_core_common_1.Disposable {
                 change.originalEndLineNumber,
                 change.modifiedStartLineNumber,
                 change.modifiedEndLineNumber,
-                (_a = change.charChanges) === null || _a === void 0 ? void 0 : _a.map((charChange) => ([
+                (_a = change.charChanges) === null || _a === void 0 ? void 0 : _a.map((charChange) => [
                     charChange.originalStartLineNumber,
                     charChange.originalStartColumn,
                     charChange.originalEndLineNumber,
@@ -550,7 +559,7 @@ class BrowserDiffEditor extends ide_core_common_1.Disposable {
                     charChange.modifiedStartColumn,
                     charChange.modifiedEndLineNumber,
                     charChange.modifiedEndColumn,
-                ])),
+                ]),
             ];
         });
     }
@@ -625,16 +634,16 @@ function preventNavigation(e) {
     }
 }
 let DiffEditorPart = class DiffEditorPart extends BaseMonacoEditorWrapper {
+    get currentDocumentModel() {
+        return this.getDocumentModel();
+    }
     constructor(monacoEditor, getDocumentModel, type) {
         super(monacoEditor, type);
         this.getDocumentModel = getDocumentModel;
     }
-    get currentDocumentModel() {
-        return this.getDocumentModel();
-    }
 };
 DiffEditorPart = tslib_1.__decorate([
     (0, di_1.Injectable)({ multiple: true }),
-    tslib_1.__metadata("design:paramtypes", [Object, Function, Number])
+    tslib_1.__metadata("design:paramtypes", [Object, Function, Object])
 ], DiffEditorPart);
 //# sourceMappingURL=editor-collection.service.js.map