@opensumi/ide-editor 2.27.3-next-1714461024.0 → 2.27.3-next-1714464252.0

package/lib/browser/merge-conflict/conflict-parser.d.ts

@@ -0,0 +1,46 @@
+import { Disposable, LRUCache } from '@opensumi/ide-core-common';
+import * as monaco from '@opensumi/ide-monaco';
+import { ICacheDocumentMergeConflict, IDocumentMergeConflictDescriptor, IMergeRegion } from './types';
+export interface IConflictCache {
+    id: string;
+    range: monaco.Range;
+    text: string;
+    isResolved: boolean;
+}
+export declare class TextLine {
+    lineNumber: number;
+    text: string;
+    range: monaco.Range;
+    rangeIncludingLineBreak: monaco.Range;
+    firstNonWhitespaceCharacterIndex: number;
+    isEmptyOrWhitespace: boolean;
+    constructor(document: monaco.editor.ITextModel, line: number);
+}
+export declare class MergeConflictParser extends Disposable {
+    cache: LRUCache<string, DocumentMergeConflict[]>;
+    private _conflictTextCaches;
+    private _conflictRangeCaches;
+    private static createCacheKey;
+    scanDocument(document: monaco.editor.ITextModel): DocumentMergeConflict[];
+    getConflictText(uri: string): string | undefined;
+    getAllConflictsByUri(uri: string): IConflictCache[] | undefined;
+    getAllConflicts(): Map<string, IConflictCache[]>;
+    setConflictResolved(uri: string, id: string): void;
+    deleteConflictText(uri: string): void;
+    dispose(): void;
+}
+export declare class DocumentMergeConflict implements ICacheDocumentMergeConflict {
+    range: monaco.Range;
+    current: IMergeRegion;
+    incoming: IMergeRegion;
+    commonAncestors: IMergeRegion[];
+    splitter: monaco.Range;
+    incomingContent: string;
+    currentContent: string;
+    bothContent: string;
+    aiContent?: string;
+    defaultContent: string;
+    private applied;
+    constructor(descriptor: IDocumentMergeConflictDescriptor);
+}
+//# sourceMappingURL=conflict-parser.d.ts.map

package/lib/browser/merge-conflict/conflict-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-parser.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/conflict-parser.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAQ,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AActG,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,QAAQ;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,uBAAuB,EAAE,MAAM,CAAC,KAAK,CAAC;IACtC,gCAAgC,EAAE,MAAM,CAAC;IACzC,mBAAmB,EAAE,OAAO,CAAC;gBACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM;CAY7D;AAED,qBACa,mBAAoB,SAAQ,UAAU;IACjD,KAAK,4CAAsD;IAE3D,OAAO,CAAC,mBAAmB,CAA6B;IAExD,OAAO,CAAC,oBAAoB,CAAuC;IAEnE,OAAO,CAAC,MAAM,CAAC,cAAc;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAkF/C,eAAe,CAAC,GAAG,EAAE,MAAM;IAG3B,oBAAoB,CAAC,GAAG,EAAE,MAAM;IAIhC,eAAe;IAIf,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAU3C,kBAAkB,CAAC,GAAG,EAAE,MAAM;IAG9B,OAAO;CAIR;AAiID,qBAAa,qBAAsB,YAAW,2BAA2B;IAChE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,OAAO,CAAS;gBACZ,UAAU,EAAE,gCAAgC;CAOzD"}

package/lib/browser/merge-conflict/conflict-parser.js

@@ -0,0 +1,209 @@
+"use strict";
+/* ---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Some code copied and modified from https://github.com/microsoft/vscode/blob/main/extensions/merge-conflict/src/mergeConflictParser.ts
+var MergeConflictParser_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DocumentMergeConflict = exports.MergeConflictParser = exports.TextLine = void 0;
+const tslib_1 = require("tslib");
+const di_1 = require("@opensumi/di");
+const ide_core_common_1 = require("@opensumi/ide-core-common");
+const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
+const startHeaderMarker = '<<<<<<<';
+const commonAncestorsMarker = '|||||||';
+const splitterMarker = '=======';
+const endFooterMarker = '>>>>>>>';
+class TextLine {
+    constructor(document, line) {
+        if (typeof line !== 'number' || line <= 0 || line > document.getLineCount()) {
+            throw new Error('Illegal value for `line`');
+        }
+        this.text = document.getLineContent(line);
+        this.firstNonWhitespaceCharacterIndex = /^(\s*)/.exec(this.text)[1].length;
+        this.range = new monaco.Range(line, 1, line, this.text.length + 1);
+        this.rangeIncludingLineBreak =
+            line <= document.getLineCount() ? new monaco.Range(line, 1, line + 1, 1) : this.range;
+        this.lineNumber = line;
+        this.isEmptyOrWhitespace = this.firstNonWhitespaceCharacterIndex === this.text.length;
+    }
+}
+exports.TextLine = TextLine;
+let MergeConflictParser = MergeConflictParser_1 = class MergeConflictParser extends ide_core_common_1.Disposable {
+    constructor() {
+        super(...arguments);
+        this.cache = new ide_core_common_1.LRUCache(100);
+        this._conflictTextCaches = new Map();
+        this._conflictRangeCaches = new Map();
+    }
+    static createCacheKey(document) {
+        return `${document.uri.toString()}-${document.getAlternativeVersionId()}`;
+    }
+    scanDocument(document) {
+        const cacheKey = MergeConflictParser_1.createCacheKey(document);
+        if (this.cache.has(cacheKey)) {
+            return this.cache.get(cacheKey);
+        }
+        // Scan each line in the document, we already know there is at least a <<<<<<< and
+        // >>>>>> marker within the document, we need to group these into conflict ranges.
+        // We initially build a scan match, that references the lines of the header, splitter
+        // and footer. This is then converted into a full descriptor containing all required
+        // ranges.
+        let currentConflict = null;
+        const conflictDescriptors = [];
+        const cacheConflictDescriptors = this._conflictTextCaches.get(document.uri.toString());
+        for (let i = 0; i < document.getLineCount(); i++) {
+            const line = new TextLine(document, i + 1);
+            // Ignore empty lines
+            if (!line || line.isEmptyOrWhitespace) {
+                continue;
+            }
+            // Is this a start line? <<<<<<<
+            if (line.text.startsWith(startHeaderMarker)) {
+                if (currentConflict !== null) {
+                    // Error, we should not see a startMarker before we've seen an endMarker
+                    currentConflict = null;
+                    // Give up parsing, anything matched up this to this point will be decorated
+                    // anything after will not
+                    break;
+                }
+                // Create a new conflict starting at this line
+                currentConflict = { startHeader: line, commonAncestors: [] };
+            }
+            // Are we within a conflict block and is this a common ancestors marker? |||||||
+            else if (currentConflict && !currentConflict.splitter && line.text.startsWith(commonAncestorsMarker)) {
+                currentConflict.commonAncestors.push(line);
+            }
+            // Are we within a conflict block and is this a splitter? =======
+            else if (currentConflict && !currentConflict.splitter && line.text === splitterMarker) {
+                currentConflict.splitter = line;
+            }
+            // Are we within a conflict block and is this a footer? >>>>>>>
+            else if (currentConflict && line.text.startsWith(endFooterMarker)) {
+                currentConflict.endFooter = line;
+                // Create a full descriptor from the lines that we matched. This can return
+                // null if the descriptor could not be completed.
+                const completeDescriptor = scanItemTolMergeConflictDescriptor(document, currentConflict);
+                if (completeDescriptor !== null) {
+                    conflictDescriptors.push(completeDescriptor);
+                }
+                // Reset the current conflict to be empty, so we can match the next
+                // starting header marker.
+                currentConflict = null;
+            }
+        }
+        if (!cacheConflictDescriptors && conflictDescriptors.length) {
+            this._conflictTextCaches.set(document.uri.toString(), document.getValue());
+            const conflictRanges = [];
+            conflictDescriptors.filter(Boolean).forEach((descriptor) => {
+                const range = descriptor.range;
+                conflictRanges.push({
+                    id: (0, ide_core_common_1.uuid)(),
+                    range,
+                    text: document.getValueInRange(range),
+                    isResolved: false,
+                });
+            });
+            this._conflictRangeCaches.set(document.uri.toString(), conflictRanges);
+        }
+        const result = conflictDescriptors === null || conflictDescriptors === void 0 ? void 0 : conflictDescriptors.filter(Boolean).map((descriptor) => new DocumentMergeConflict(descriptor));
+        this.cache.set(cacheKey, result);
+        return result;
+    }
+    getConflictText(uri) {
+        return this._conflictTextCaches.get(uri);
+    }
+    getAllConflictsByUri(uri) {
+        return this._conflictRangeCaches.get(uri);
+    }
+    getAllConflicts() {
+        return this._conflictRangeCaches;
+    }
+    setConflictResolved(uri, id) {
+        const conflictRanges = this._conflictRangeCaches.get(uri);
+        if (conflictRanges) {
+            const conflictRange = conflictRanges.find((item) => item.id === id);
+            if (conflictRange) {
+                conflictRange.isResolved = true;
+            }
+        }
+    }
+    deleteConflictText(uri) {
+        this._conflictTextCaches.delete(uri);
+    }
+    dispose() {
+        this._conflictTextCaches.clear();
+        this._conflictRangeCaches.clear();
+    }
+};
+MergeConflictParser = MergeConflictParser_1 = tslib_1.__decorate([
+    (0, di_1.Injectable)()
+], MergeConflictParser);
+exports.MergeConflictParser = MergeConflictParser;
+function scanItemTolMergeConflictDescriptor(document, scanned) {
+    // Validate we have all the required lines within the scan item.
+    if (!scanned.startHeader || !scanned.splitter || !scanned.endFooter) {
+        return null;
+    }
+    const tokenAfterCurrentBlock = scanned.commonAncestors[0] || scanned.splitter;
+    // Assume that descriptor.current.header, descriptor.incoming.header and descriptor.splitter
+    // have valid ranges, fill in content and total ranges from these parts.
+    // NOTE: We need to shift the decorator range back one character so the splitter does not end up with
+    // two decoration colors (current and splitter), if we take the new line from the content into account
+    // the decorator will wrap to the next line.
+    return {
+        current: {
+            header: scanned.startHeader.range,
+            decoratorContent: new monaco.Range(scanned.startHeader.rangeIncludingLineBreak.endLineNumber, scanned.startHeader.rangeIncludingLineBreak.endColumn, shiftBackOneCharacter(document, tokenAfterCurrentBlock.range.getStartPosition(), scanned.startHeader.rangeIncludingLineBreak.getEndPosition()).lineNumber, shiftBackOneCharacter(document, tokenAfterCurrentBlock.range.getStartPosition(), scanned.startHeader.rangeIncludingLineBreak.getEndPosition()).column),
+            // Current content is range between header (shifted for linebreak) and splitter or common ancestors mark start
+            content: new monaco.Range(scanned.startHeader.rangeIncludingLineBreak.endLineNumber, scanned.startHeader.rangeIncludingLineBreak.endColumn, tokenAfterCurrentBlock.range.startLineNumber, tokenAfterCurrentBlock.range.startColumn),
+            name: scanned.startHeader.text.substring(startHeaderMarker.length + 1),
+        },
+        commonAncestors: scanned.commonAncestors.map((currentTokenLine, index, commonAncestors) => {
+            const nextTokenLine = commonAncestors[index + 1] || scanned.splitter;
+            return {
+                header: currentTokenLine.range,
+                decoratorContent: new monaco.Range(currentTokenLine.rangeIncludingLineBreak.endLineNumber, currentTokenLine.rangeIncludingLineBreak.endColumn, shiftBackOneCharacter(document, nextTokenLine.range.getStartPosition(), currentTokenLine.rangeIncludingLineBreak.getEndPosition()).lineNumber, shiftBackOneCharacter(document, nextTokenLine.range.getStartPosition(), currentTokenLine.rangeIncludingLineBreak.getEndPosition()).lineNumber),
+                // Each common ancestors block is range between one common ancestors token
+                // (shifted for linebreak) and start of next common ancestors token or splitter
+                content: new monaco.Range(currentTokenLine.rangeIncludingLineBreak.endLineNumber, currentTokenLine.rangeIncludingLineBreak.endColumn, nextTokenLine.range.startLineNumber, nextTokenLine.range.startColumn),
+                name: currentTokenLine.text.substring(commonAncestorsMarker.length + 1),
+            };
+        }),
+        splitter: scanned.splitter.range,
+        incoming: {
+            header: scanned.endFooter.range,
+            decoratorContent: new monaco.Range(scanned.splitter.rangeIncludingLineBreak.endLineNumber, scanned.splitter.rangeIncludingLineBreak.endColumn, shiftBackOneCharacter(document, scanned.endFooter.range.getStartPosition(), scanned.splitter.rangeIncludingLineBreak.getEndPosition()).lineNumber, shiftBackOneCharacter(document, scanned.endFooter.range.getStartPosition(), scanned.splitter.rangeIncludingLineBreak.getEndPosition()).column),
+            // Incoming content is range between splitter (shifted for linebreak) and footer start
+            content: new monaco.Range(scanned.splitter.rangeIncludingLineBreak.endLineNumber, scanned.splitter.rangeIncludingLineBreak.endColumn, scanned.endFooter.range.startLineNumber, scanned.endFooter.range.startColumn),
+            name: scanned.endFooter.text.substring(endFooterMarker.length + 1),
+        },
+        // Entire range is between current header start and incoming header end (including line break)
+        range: new monaco.Range(scanned.startHeader.range.startLineNumber, scanned.startHeader.range.startColumn, scanned.endFooter.range.endLineNumber, scanned.endFooter.range.endColumn),
+    };
+}
+function shiftBackOneCharacter(document, range, unlessEqual) {
+    if (range.equals(unlessEqual)) {
+        return range;
+    }
+    let line = range.lineNumber;
+    let character = range.column - 1;
+    if (character < 0) {
+        line--;
+        character = new TextLine(document, line).range.endColumn;
+    }
+    return new monaco.Position(line, character);
+}
+class DocumentMergeConflict {
+    constructor(descriptor) {
+        this.applied = false;
+        this.range = descriptor.range;
+        this.current = descriptor.current;
+        this.incoming = descriptor.incoming;
+        this.commonAncestors = descriptor.commonAncestors;
+        this.splitter = descriptor.splitter;
+    }
+}
+exports.DocumentMergeConflict = DocumentMergeConflict;
+//# sourceMappingURL=conflict-parser.js.map

package/lib/browser/merge-conflict/conflict-parser.js.map

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

package/lib/browser/merge-conflict/index.d.ts

@@ -0,0 +1,3 @@
+export * from './conflict-parser';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

package/lib/browser/merge-conflict/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC"}

package/lib/browser/merge-conflict/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./conflict-parser"), exports);
+tslib_1.__exportStar(require("./types"), exports);
+//# sourceMappingURL=index.js.map

package/lib/browser/merge-conflict/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/index.ts"],"names":[],"mappings":";;;AAAA,4DAAkC;AAClC,kDAAwB"}

package/lib/browser/merge-conflict/types.d.ts

@@ -0,0 +1,60 @@
+import * as monaco from '@opensumi/ide-monaco';
+export interface IMergeRegion {
+    name: string;
+    header: monaco.Range;
+    content: monaco.Range;
+    decoratorContent?: monaco.Range;
+}
+export declare const enum CommitType {
+    Current = 0,
+    Incoming = 1,
+    Both = 2
+}
+export interface IExtensionConfiguration {
+    enableCodeLens: boolean;
+    enableDecorations: boolean;
+    enableEditorOverview: boolean;
+}
+export interface IDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
+    commitEdit(type: CommitType, editor: monaco.editor.ITextModel): Thenable<boolean>;
+    applyEdit(type: CommitType, document: monaco.editor.ITextModel, edit: {
+        replace(range: monaco.Range, newText: string): void;
+    }): void;
+}
+export interface IDocumentMergeConflictDescriptor {
+    [x: string]: any;
+    range: monaco.Range;
+    current: IMergeRegion;
+    incoming: IMergeRegion;
+    commonAncestors: IMergeRegion[];
+    splitter: monaco.Range;
+}
+export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
+    incomingContent: string;
+    currentContent: string;
+    bothContent: string;
+    aiContent?: string;
+    defaultContent: string;
+}
+export interface IDocumentMergeConflictTracker {
+    getConflicts(document: monaco.editor.ITextModel): PromiseLike<IDocumentMergeConflict[]>;
+    isPending(document: monaco.editor.ITextModel): boolean;
+    forget(document: monaco.editor.ITextModel): void;
+}
+export interface IDocumentMergeConflictTrackerService {
+    createTracker(origin: string): IDocumentMergeConflictTracker;
+    forget(document: monaco.editor.ITextModel): void;
+}
+export interface IDocumentMergeConflictNavigationResults {
+    canNavigate: boolean;
+    conflict?: IDocumentMergeConflict;
+}
+export declare enum NavigationDirection {
+    Forwards = 0,
+    Backwards = 1
+}
+export declare namespace AI_COMMAND {
+    const ACCEPT: string;
+    const REVERT: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/lib/browser/merge-conflict/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;CACjC;AAED,0BAAkB,UAAU;IAC1B,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,IAAI,IAAA;CACL;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gCAAgC;IAC9E,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClF,SAAS,CACP,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAClC,IAAI,EAAE;QAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC5D,IAAI,CAAC;CACT;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;CACxB;AAGD,MAAM,WAAW,2BAA4B,SAAQ,gCAAgC;IACnF,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AACD,MAAM,WAAW,6BAA6B;IAC5C,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,WAAW,CAAC,sBAAsB,EAAE,CAAC,CAAC;IACxF,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;IACvD,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,oCAAoC;IACnD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,CAAC;IAC7D,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,uCAAuC;IACtD,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,sBAAsB,CAAC;CACnC;AAED,oBAAY,mBAAmB;IAC7B,QAAQ,IAAA;IACR,SAAS,IAAA;CACV;AAED,yBAAiB,UAAU,CAAC;IAEnB,MAAM,MAAM,QAAgC,CAAC;IAC7C,MAAM,MAAM,QAAgC,CAAC;CACrD"}

package/lib/browser/merge-conflict/types.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AI_COMMAND = exports.NavigationDirection = void 0;
+var NavigationDirection;
+(function (NavigationDirection) {
+    NavigationDirection[NavigationDirection["Forwards"] = 0] = "Forwards";
+    NavigationDirection[NavigationDirection["Backwards"] = 1] = "Backwards";
+})(NavigationDirection = exports.NavigationDirection || (exports.NavigationDirection = {}));
+var AI_COMMAND;
+(function (AI_COMMAND) {
+    const MERGE_CONFLICT = 'merge-conflict';
+    AI_COMMAND.ACCEPT = `${MERGE_CONFLICT}.ai.accept`;
+    AI_COMMAND.REVERT = `${MERGE_CONFLICT}.ai.revert`;
+})(AI_COMMAND = exports.AI_COMMAND || (exports.AI_COMMAND = {}));
+//# sourceMappingURL=types.js.map

package/lib/browser/merge-conflict/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":";;;AA+DA,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,qEAAQ,CAAA;IACR,uEAAS,CAAA;AACX,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAED,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACzB,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC3B,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;IACvC,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;AACtD,CAAC,EAJgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAI1B"}

package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAGA,OAAO,EAML,GAAG,EAIJ,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAmHzE,CAAC"}
+{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAGA,OAAO,EAOL,GAAG,EAGJ,MAAM,4BAA4B,CAAC;AAMpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAiJzE,CAAC"}

package/lib/browser/merge-editor/MergeEditorFloatComponents.js

@@ -5,28 +5,45 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const ide_components_1 = require("@opensumi/ide-components");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const editor_module_less_1 = tslib_1.__importDefault(require("../editor.module.less"));
+const git_1 = require("@opensumi/ide-core-common/lib/commands/git");
+const useEditor_1 = require("../hooks/useEditor");
+const useInMergeChanges_1 = require("../hooks/useInMergeChanges");
+const merge_conflict_1 = require("../merge-conflict");
+const merge_editor_module_less_1 = tslib_1.__importDefault(require("./merge-editor.module.less"));
 const MergeEditorFloatComponents = ({ resource }) => {
     const aiNativeConfigService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AINativeConfigService);
     const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
     const commandRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandRegistry);
-    const contextKeyService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.IContextKeyService);
+    const mergeConflictParser = (0, ide_core_browser_1.useInjectable)(merge_conflict_1.MergeConflictParser);
+    const editorModel = (0, useEditor_1.useEditorDocumentModelRef)(resource.uri);
     const [isVisiable, setIsVisiable] = (0, react_1.useState)(false);
-    const gitMergeChangesSet = new Set(['git.mergeChanges']);
+    const [conflicts, setConflicts] = (0, react_1.useState)([]);
+    const inMergeChanges = (0, useInMergeChanges_1.useInMergeChanges)(resource.uri.toString());
     (0, react_1.useEffect)(() => {
-        const run = () => {
-            const mergeChanges = contextKeyService.getValue('git.mergeChanges') || [];
-            setIsVisiable(mergeChanges.some((value) => value.toString() === resource.uri.toString()));
-        };
-        const disposed = contextKeyService.onDidChangeContext(({ payload }) => {
-            if (payload.affectsSome(gitMergeChangesSet)) {
+        const disposables = new ide_core_browser_1.DisposableStore();
+        if (editorModel) {
+            const { instance } = editorModel;
+            const run = () => {
+                const conflicts = mergeConflictParser.scanDocument(instance.getMonacoModel());
+                if (conflicts.length > 0) {
+                    setIsVisiable(true);
+                    setConflicts(conflicts);
+                }
+                else {
+                    setIsVisiable(false);
+                    setConflicts([]);
+                }
+            };
+            disposables.add(editorModel.instance.getMonacoModel().onDidChangeContent(() => {
                 run();
-            }
-        });
-        run();
-        return () => disposed.dispose();
-    }, [resource]);
-    const [isAiResolving, setIsAiResolving] = (0, react_1.useState)(false);
+            }));
+            run();
+            return () => {
+                disposables.dispose();
+            };
+        }
+    }, [editorModel]);
+    const [isAIResolving, setIsAIResolving] = (0, react_1.useState)(false);
     const handleOpenMergeEditor = (0, react_1.useCallback)(async () => {
         const { uri } = resource;
         [ide_core_browser_1.SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, ide_core_browser_1.SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
@@ -35,49 +52,58 @@ const MergeEditorFloatComponents = ({ resource }) => {
             }
         });
     }, [resource]);
-    const isSupportAiResolve = (0, react_1.useCallback)(() => aiNativeConfigService.capabilities.supportsConflictResolve, [aiNativeConfigService]);
-    const handlePrev = () => {
-        commandService.tryExecuteCommand('merge-conflict.previous');
-    };
-    const handleNext = () => {
-        commandService.tryExecuteCommand('merge-conflict.next');
-    };
+    const isSupportAIResolve = (0, react_1.useCallback)(() => aiNativeConfigService.capabilities.supportsConflictResolve, [aiNativeConfigService]);
+    const handlePrev = (0, react_1.useCallback)(() => {
+        commandService.tryExecuteCommand(git_1.MergeConflictCommands.Previous).then(() => {
+            // TODO: 编辑器向上滚动一行
+        });
+    }, []);
+    const handleNext = (0, react_1.useCallback)(() => {
+        commandService.tryExecuteCommand(git_1.MergeConflictCommands.Next).then(() => {
+            // TODO: 编辑器向上滚动一行
+        });
+    }, []);
     const handleAIResolve = (0, react_1.useCallback)(async () => {
-        setIsAiResolving(true);
-        if (isAiResolving) {
-            await commandService.executeCommand('merge-conflict.ai.all-accept-stop', resource.uri);
+        setIsAIResolving(true);
+        if (isAIResolving) {
+            await commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT_STOP.id, resource.uri);
         }
         else {
-            await commandService.executeCommand('merge-conflict.ai.all-accept', resource.uri);
+            await commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT.id, resource.uri);
         }
-        setIsAiResolving(false);
-    }, [resource, isAiResolving]);
+        setIsAIResolving(false);
+    }, [resource, isAIResolving]);
     const handleReset = (0, react_1.useCallback)(() => {
-        commandService.executeCommand('merge-conflict.ai.all-reset', resource.uri);
+        commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.ALL_RESET.id, resource.uri);
     }, [resource]);
     if (!isVisiable) {
         return null;
     }
-    return (react_1.default.createElement("div", { className: editor_module_less_1.default.merge_editor_float_container },
-        react_1.default.createElement("div", { id: 'merge.editor.action.button.accept' },
-            react_1.default.createElement(ide_components_1.Button, { className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handlePrev },
-                react_1.default.createElement(ide_components_1.Icon, { icon: 'left' }),
-                react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.prev'))),
-            react_1.default.createElement(ide_components_1.Button, { className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleNext },
-                react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.next')),
-                react_1.default.createElement(ide_components_1.Icon, { icon: 'right' }))),
-        react_1.default.createElement("span", { className: editor_module_less_1.default.line_vertical }),
-        react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.open.tradition', className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleOpenMergeEditor },
-            react_1.default.createElement(ide_components_1.Icon, { icon: 'swap' }),
-            react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.open.3way'))),
-        react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.rest', className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleReset },
-            react_1.default.createElement(ide_components_1.Icon, { icon: 'discard' }),
-            react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.reset'))),
-        isSupportAiResolve() && (react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.conflict.resolve.all', size: 'large', className: `${editor_module_less_1.default.merge_conflict_bottom_btn} ${editor_module_less_1.default.magic_btn}`, onClick: handleAIResolve }, isAiResolving ? (react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(ide_components_1.Icon, { icon: 'circle-pause' }),
-            react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.resolve.all.stop')))) : (react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(ide_components_1.Icon, { icon: 'magic-wand' }),
-            react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.resolve.all'))))))));
+    return (react_1.default.createElement("div", { className: merge_editor_module_less_1.default.merge_editor_float_container },
+        react_1.default.createElement("div", { className: merge_editor_module_less_1.default.merge_editor_float_container_info },
+            "\u5269\u4F59\u672A\u89E3\u51B3\u51B2\u7A81 ",
+            conflicts.length,
+            " \u5904"),
+        react_1.default.createElement("div", { className: merge_editor_module_less_1.default.merge_editor_float_container_operation_bar },
+            react_1.default.createElement("div", { id: 'merge.editor.action.button.nav' },
+                react_1.default.createElement(ide_components_1.Button, { className: merge_editor_module_less_1.default.merge_conflict_bottom_btn, size: 'default', onClick: handlePrev },
+                    react_1.default.createElement(ide_components_1.Icon, { icon: 'left' }),
+                    react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.prev'))),
+                react_1.default.createElement(ide_components_1.Button, { className: merge_editor_module_less_1.default.merge_conflict_bottom_btn, size: 'default', onClick: handleNext },
+                    react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.next')),
+                    react_1.default.createElement(ide_components_1.Icon, { icon: 'right' }))),
+            react_1.default.createElement("span", { className: merge_editor_module_less_1.default.line_vertical }),
+            inMergeChanges && (react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.open.tradition', className: merge_editor_module_less_1.default.merge_conflict_bottom_btn, size: 'default', onClick: handleOpenMergeEditor },
+                react_1.default.createElement(ide_components_1.Icon, { icon: 'swap' }),
+                react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.open.3way')))),
+            react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.rest', className: merge_editor_module_less_1.default.merge_conflict_bottom_btn, size: 'default', onClick: handleReset },
+                react_1.default.createElement(ide_components_1.Icon, { icon: 'discard' }),
+                react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.reset'))),
+            isSupportAIResolve() && (react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.conflict.resolve.all', size: 'default', className: `${merge_editor_module_less_1.default.merge_conflict_bottom_btn} ${merge_editor_module_less_1.default.magic_btn}`, onClick: handleAIResolve }, isAIResolving ? (react_1.default.createElement(react_1.default.Fragment, null,
+                react_1.default.createElement(ide_components_1.Icon, { icon: 'circle-pause' }),
+                react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.ai.resolve.all.stop')))) : (react_1.default.createElement(react_1.default.Fragment, null,
+                react_1.default.createElement(ide_components_1.Icon, { icon: 'magic-wand' }),
+                react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.ai.resolve.all')))))))));
 };
 exports.MergeEditorFloatComponents = MergeEditorFloatComponents;
 //# sourceMappingURL=MergeEditorFloatComponents.js.map

package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,uDAAgE;AAEhE,6DAAwD;AACxD,iEAUoC;AACpC,oEAAmF;AAEnF,kDAA+D;AAC/D,kEAA+D;AAC/D,sDAA+E;AAG/E,kGAAgD;AAEzC,MAAM,0BAA0B,GAAuC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7F,MAAM,qBAAqB,GAAG,IAAA,gCAAa,EAAwB,wCAAqB,CAAC,CAAC;IAC1F,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAiB,iCAAc,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAA,gCAAa,EAAkB,kCAAe,CAAC,CAAC;IACxE,MAAM,mBAAmB,GAAwB,IAAA,gCAAa,EAAC,oCAAmB,CAAC,CAAC;IAEpF,MAAM,WAAW,GAAG,IAAA,qCAAyB,EAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE5D,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAA0B,EAAE,CAAC,CAAC;IAExE,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAElE,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,IAAI,kCAAe,EAAE,CAAC;QAE1C,IAAI,WAAW,EAAE;YACf,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;YACjC,MAAM,GAAG,GAAG,GAAG,EAAE;gBACf,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;gBAC9E,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxB,aAAa,CAAC,IAAI,CAAC,CAAC;oBACpB,YAAY,CAAC,SAAS,CAAC,CAAC;iBACzB;qBAAM;oBACL,aAAa,CAAC,KAAK,CAAC,CAAC;oBACrB,YAAY,CAAC,EAAE,CAAC,CAAC;iBAClB;YACH,CAAC,CAAC;YAEF,WAAW,CAAC,GAAG,CACb,WAAW,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAC5D,GAAG,EAAE,CAAC;YACR,CAAC,CAAC,CACH,CAAC;YACF,GAAG,EAAE,CAAC;YACN,OAAO,GAAG,EAAE;gBACV,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,qBAAqB,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QACnD,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;QAEzB,CAAC,+BAAY,CAAC,qBAAqB,EAAE,+BAAY,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YACpG,IAAI,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;gBAC7E,cAAc,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aAC7C;QACH,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EACpC,GAAG,EAAE,CAAC,qBAAqB,CAAC,YAAY,CAAC,uBAAuB,EAChE,CAAC,qBAAqB,CAAC,CACxB,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,cAAc,CAAC,iBAAiB,CAAC,2BAAqB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACzE,kBAAkB;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,cAAc,CAAC,iBAAiB,CAAC,2BAAqB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACrE,kBAAkB;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,aAAa,EAAE;YACjB,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,kBAAkB,CAAC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;SAClG;aAAM;YACL,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,aAAa,CAAC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC7F;QACD,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAE9B,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACnC,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpF,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,uCAAK,SAAS,EAAE,kCAAM,CAAC,4BAA4B;QACjD,uCAAK,SAAS,EAAE,kCAAM,CAAC,iCAAiC;;YAAW,SAAS,CAAC,MAAM;sBAAS;QAC5F,uCAAK,SAAS,EAAE,kCAAM,CAAC,0CAA0C;YAC/D,uCAAK,EAAE,EAAC,gCAAgC;gBACtC,8BAAC,uBAAM,IAAC,SAAS,EAAE,kCAAM,CAAC,yBAAyB,EAAE,IAAI,EAAC,SAAS,EAAC,OAAO,EAAE,UAAU;oBACrF,8BAAC,qBAAI,IAAC,IAAI,EAAE,MAAM,GAAI;oBACtB,4CAAO,IAAA,2BAAQ,EAAC,2BAA2B,CAAC,CAAQ,CAC7C;gBACT,8BAAC,uBAAM,IAAC,SAAS,EAAE,kCAAM,CAAC,yBAAyB,EAAE,IAAI,EAAC,SAAS,EAAC,OAAO,EAAE,UAAU;oBACrF,4CAAO,IAAA,2BAAQ,EAAC,2BAA2B,CAAC,CAAQ;oBACpD,8BAAC,qBAAI,IAAC,IAAI,EAAE,OAAO,GAAI,CAChB,CACL;YACN,wCAAM,SAAS,EAAE,kCAAM,CAAC,aAAa,GAAS;YAC7C,cAAc,IAAI,CACjB,8BAAC,uBAAM,IACL,EAAE,EAAC,6BAA6B,EAChC,SAAS,EAAE,kCAAM,CAAC,yBAAyB,EAC3C,IAAI,EAAC,SAAS,EACd,OAAO,EAAE,qBAAqB;gBAE9B,8BAAC,qBAAI,IAAC,IAAI,EAAE,MAAM,GAAI;gBACtB,4CAAO,IAAA,2BAAQ,EAAC,uBAAuB,CAAC,CAAQ,CACzC,CACV;YACD,8BAAC,uBAAM,IACL,EAAE,EAAC,mBAAmB,EACtB,SAAS,EAAE,kCAAM,CAAC,yBAAyB,EAC3C,IAAI,EAAC,SAAS,EACd,OAAO,EAAE,WAAW;gBAEpB,8BAAC,qBAAI,IAAC,IAAI,EAAE,SAAS,GAAI;gBACzB,4CAAO,IAAA,2BAAQ,EAAC,mBAAmB,CAAC,CAAQ,CACrC;YACR,kBAAkB,EAAE,IAAI,CACvB,8BAAC,uBAAM,IACL,EAAE,EAAC,mCAAmC,EACtC,IAAI,EAAC,SAAS,EACd,SAAS,EAAE,GAAG,kCAAM,CAAC,yBAAyB,IAAI,kCAAM,CAAC,SAAS,EAAE,EACpE,OAAO,EAAE,eAAe,IAEvB,aAAa,CAAC,CAAC,CAAC,CACf;gBACE,8BAAC,qBAAI,IAAC,IAAI,EAAE,cAAc,GAAI;gBAC9B,4CAAO,IAAA,2BAAQ,EAAC,0CAA0C,CAAC,CAAQ,CAClE,CACJ,CAAC,CAAC,CAAC,CACF;gBACE,8BAAC,qBAAI,IAAC,IAAI,EAAE,YAAY,GAAI;gBAC5B,4CAAO,IAAA,2BAAQ,EAAC,qCAAqC,CAAC,CAAQ,CAC7D,CACJ,CACM,CACV,CACG,CACF,CACP,CAAC;AACJ,CAAC,CAAC;AAjJW,QAAA,0BAA0B,8BAiJrC"}