@theia/scm 1.67.0-next.56 → 1.67.0-next.59

package/lib/browser/merge-editor/view/diff-spacers.js

@@ -0,0 +1,133 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DiffSpacerService = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+let DiffSpacerService = class DiffSpacerService {
+    computeDiffSpacers(changes, originalLineCount) {
+        const lineMapping = [];
+        const originalSpacers = [];
+        const modifiedSpacers = [];
+        let originalLine = 0;
+        let deltaSum = 0;
+        for (const { originalRange, modifiedRange } of changes) {
+            while (originalLine < originalRange.startLineNumber + Math.min(originalRange.lineCount, modifiedRange.lineCount)) {
+                lineMapping[originalLine] = originalLine + deltaSum;
+                originalLine++;
+            }
+            const delta = modifiedRange.lineCount - originalRange.lineCount;
+            deltaSum += delta;
+            if (delta > 0) {
+                originalSpacers[originalLine] = delta;
+            }
+            if (delta < 0) {
+                modifiedSpacers[modifiedRange.endLineNumberExclusive] = -delta;
+                originalLine += -delta;
+            }
+        }
+        while (originalLine <= originalLineCount) {
+            lineMapping[originalLine] = originalLine + deltaSum;
+            originalLine++;
+        }
+        return { originalSpacers, modifiedSpacers, lineMapping };
+    }
+    /**
+     * Combines multiple {@link DiffSpacers} objects into a {@link CombinedMultiDiffSpacers} object with the appropriately adjusted spacers.
+     * The given {@link DiffSpacers} objects are not modified.
+     *
+     * It is assumed that all of the given {@link DiffSpacers} objects have been computed from diffs against the same original side.
+     */
+    combineMultiDiffSpacers(multiDiffSpacers) {
+        var _a, _b;
+        if (multiDiffSpacers.length < 2) {
+            throw new Error('At least two items are required');
+        }
+        this.checkLineMappingsHaveEqualLength(multiDiffSpacers);
+        const originalSpacers = [];
+        const modifiedSides = [];
+        for (const { modifiedSpacers, lineMapping } of multiDiffSpacers) {
+            const modifiedSpacersCopy = modifiedSpacers.concat(); // note: copying by concat() preserves empty slots of the sparse array
+            modifiedSides.push({ modifiedSpacers: modifiedSpacersCopy, lineMapping });
+        }
+        const originalLineCount = modifiedSides[0].lineMapping.length;
+        for (let originalLine = 0; originalLine < originalLineCount; originalLine++) {
+            const max = Math.max(...multiDiffSpacers.map(diffSpacers => { var _a; return (_a = diffSpacers.originalSpacers[originalLine]) !== null && _a !== void 0 ? _a : 0; }));
+            if (max > 0) {
+                originalSpacers[originalLine] = max;
+                for (let i = 0; i < multiDiffSpacers.length; i++) {
+                    const delta = max - ((_a = multiDiffSpacers[i].originalSpacers[originalLine]) !== null && _a !== void 0 ? _a : 0);
+                    if (delta > 0) {
+                        const { modifiedSpacers, lineMapping } = modifiedSides[i];
+                        const modifiedLine = this.projectLine(originalLine, lineMapping);
+                        modifiedSpacers[modifiedLine] = ((_b = modifiedSpacers[modifiedLine]) !== null && _b !== void 0 ? _b : 0) + delta;
+                    }
+                }
+            }
+        }
+        return { originalSpacers, modifiedSides };
+    }
+    /**
+     * Given a {@link CombinedMultiDiffSpacers} object, excludes the original side, returning the modified sides with the appropriately adjusted spacers.
+     * The given {@link CombinedMultiDiffSpacers} object is not modified.
+     */
+    excludeOriginalSide({ modifiedSides }) {
+        if (modifiedSides.length < 2) {
+            throw new Error('At least two modified sides are required');
+        }
+        this.checkLineMappingsHaveEqualLength(modifiedSides);
+        const modifiedSidesCopy = [];
+        for (const { modifiedSpacers } of modifiedSides) {
+            const modifiedSpacersCopy = modifiedSpacers.concat(); // note: copying by concat() preserves empty slots of the sparse array
+            modifiedSidesCopy.push({ modifiedSpacers: modifiedSpacersCopy });
+        }
+        // When the original side is excluded, the adjoining spacers in the modified sides can be deflated by removing their intersecting parts.
+        const originalLineCount = modifiedSides[0].lineMapping.length;
+        for (let originalLine = 0; originalLine < originalLineCount; originalLine++) {
+            if (modifiedSides.every(({ lineMapping }) => lineMapping[originalLine] === undefined)) {
+                modifiedSides.forEach(({ lineMapping }, index) => {
+                    const modifiedLine = this.projectLine(originalLine, lineMapping);
+                    const { modifiedSpacers } = modifiedSidesCopy[index];
+                    modifiedSpacers[modifiedLine]--;
+                });
+            }
+        }
+        return { modifiedSides: modifiedSidesCopy };
+    }
+    checkLineMappingsHaveEqualLength(items) {
+        if (!core_1.ArrayUtils.checkAdjacentItems(items, (item1, item2) => item1.lineMapping.length === item2.lineMapping.length)) {
+            throw new Error('Line mappings must have equal length');
+        }
+    }
+    projectLine(originalLine, lineMapping) {
+        let modifiedLine;
+        const originalLineCount = lineMapping.length;
+        while (originalLine < originalLineCount) {
+            modifiedLine = lineMapping[originalLine++];
+            if (modifiedLine !== undefined) {
+                return modifiedLine;
+            }
+        }
+        throw new Error('Assertion failed');
+    }
+};
+exports.DiffSpacerService = DiffSpacerService;
+exports.DiffSpacerService = DiffSpacerService = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], DiffSpacerService);
+//# sourceMappingURL=diff-spacers.js.map

package/lib/browser/merge-editor/view/diff-spacers.js.map

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

package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts

@@ -0,0 +1,6 @@
+export * from './merge-editor-pane';
+export * from './merge-editor-pane-header';
+export * from './merge-editor-base-pane';
+export * from './merge-editor-side-pane';
+export * from './merge-editor-result-pane';
+//# sourceMappingURL=index.d.ts.map

package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/index.ts"],"names":[],"mappings":"AAgBA,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC"}

package/lib/browser/merge-editor/view/merge-editor-panes/index.js

@@ -0,0 +1,24 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./merge-editor-pane"), exports);
+tslib_1.__exportStar(require("./merge-editor-pane-header"), exports);
+tslib_1.__exportStar(require("./merge-editor-base-pane"), exports);
+tslib_1.__exportStar(require("./merge-editor-side-pane"), exports);
+tslib_1.__exportStar(require("./merge-editor-result-pane"), exports);
+//# sourceMappingURL=index.js.map

package/lib/browser/merge-editor/view/merge-editor-panes/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/index.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,8DAAoC;AACpC,qEAA2C;AAC3C,mEAAyC;AACzC,mEAAyC;AACzC,qEAA2C"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts

@@ -0,0 +1,12 @@
+import { EditorDecoration, Range } from '@theia/editor/lib/browser';
+import { MergeEditorPane } from './merge-editor-pane';
+import { MergeRange } from '../../model/merge-range';
+import { LineRange } from '../../model/line-range';
+export declare class MergeEditorBasePane extends MergeEditorPane {
+    constructor();
+    getLineRangeForMergeRange(mergeRange: MergeRange): LineRange;
+    protected translateBaseRange(range: Range): Range;
+    protected onAfterMergeEditorSet(): void;
+    protected computeEditorDecorations(): EditorDecoration[];
+}
+//# sourceMappingURL=merge-editor-base-pane.d.ts.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-base-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,qBACa,mBAAoB,SAAQ,eAAe;;IAO3C,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;cAIlD,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;cAIvC,qBAAqB,IAAI,IAAI;cAU7B,wBAAwB,IAAI,gBAAgB,EAAE;CAoBpE"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js

@@ -0,0 +1,65 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorBasePane = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const observable_1 = require("@theia/core/lib/common/observable");
+const merge_editor_pane_1 = require("./merge-editor-pane");
+let MergeEditorBasePane = class MergeEditorBasePane extends merge_editor_pane_1.MergeEditorPane {
+    constructor() {
+        super();
+        this.addClass('base');
+    }
+    getLineRangeForMergeRange(mergeRange) {
+        return mergeRange.baseRange;
+    }
+    translateBaseRange(range) {
+        return range;
+    }
+    onAfterMergeEditorSet() {
+        super.onAfterMergeEditorSet();
+        this.toDispose.push(observable_1.Autorun.create(() => {
+            const { currentPane, side1Pane, side1Title, side2Pane, side2Title } = this.mergeEditor;
+            this.header.description = currentPane === this ? '' : core_1.nls.localizeByDefault('Comparing with {0}', currentPane === side1Pane ? side1Title : currentPane === side2Pane ? side2Title : core_1.nls.localizeByDefault('Result'));
+        }));
+    }
+    computeEditorDecorations() {
+        const result = [];
+        const { model, currentPane, side1Pane, side2Pane, currentMergeRange } = this.mergeEditor;
+        for (const mergeRange of model.mergeRanges) {
+            const lineRange = mergeRange.baseRange;
+            result.push(this.toMergeRangeDecoration(lineRange, {
+                isHandled: model.isMergeRangeHandled(mergeRange),
+                isFocused: mergeRange === currentMergeRange,
+                isAfterEnd: lineRange.startLineNumber > model.baseDocument.lineCount,
+            }));
+        }
+        if (currentPane !== this) {
+            const changes = currentPane === side1Pane ? model.side1Changes : currentPane === side2Pane ? model.side2Changes : model.resultChanges;
+            result.push(...this.toChangeDecorations(changes, { diffSide: 'original' }));
+        }
+        return result;
+    }
+};
+exports.MergeEditorBasePane = MergeEditorBasePane;
+exports.MergeEditorBasePane = MergeEditorBasePane = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [])
+], MergeEditorBasePane);
+//# sourceMappingURL=merge-editor-base-pane.js.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-base-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAA0D;AAC1D,sCAAkC;AAClC,kEAA4D;AAE5D,2DAAsD;AAK/C,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,mCAAe;IAEpD;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAEQ,yBAAyB,CAAC,UAAsB;QACrD,OAAO,UAAU,CAAC,SAAS,CAAC;IAChC,CAAC;IAEkB,kBAAkB,CAAC,KAAY;QAC9C,OAAO,KAAK,CAAC;IACjB,CAAC;IAEkB,qBAAqB;QACpC,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YACpC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;YACvF,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,oBAAoB,EAC5F,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CACpH,CAAC;QACN,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAEkB,wBAAwB;QACvC,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAEzF,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE;gBAC/C,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC;gBAChD,SAAS,EAAE,UAAU,KAAK,iBAAiB;gBAC3C,UAAU,EAAE,SAAS,CAAC,eAAe,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS;aACvE,CAAC,CAAC,CAAC;QACR,CAAC;QAED,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;YACtI,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA7CY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;;GACA,mBAAmB,CA6C/B"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.d.ts

@@ -0,0 +1,30 @@
+/// <reference types="react" />
+import * as React from '@theia/core/shared/react';
+import { Message, ReactWidget } from '@theia/core/lib/browser';
+import { LabelParser } from '@theia/core/lib/browser/label-parser';
+export declare class MergeEditorPaneHeader extends ReactWidget {
+    protected readonly labelParser: LabelParser;
+    private _description;
+    get description(): string;
+    set description(description: string);
+    private _detail;
+    get detail(): string;
+    set detail(detail: string);
+    private _toolbarItems;
+    get toolbarItems(): readonly MergeEditorPaneToolbarItem[];
+    set toolbarItems(toolbarItems: readonly MergeEditorPaneToolbarItem[]);
+    protected init(): void;
+    protected onActivateRequest(msg: Message): void;
+    protected render(): React.ReactNode;
+    private readonly handleToolbarClick;
+    protected renderWithIcons(text: string): React.ReactNode[];
+    protected renderToolbarItem({ id, label, tooltip, className, onClick }: MergeEditorPaneToolbarItem): React.ReactNode;
+}
+export interface MergeEditorPaneToolbarItem {
+    readonly id: string;
+    readonly label?: string;
+    readonly tooltip?: string;
+    readonly className?: string;
+    readonly onClick?: (event: React.MouseEvent) => void;
+}
+//# sourceMappingURL=merge-editor-pane-header.d.ts.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-pane-header.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.tsx"],"names":[],"mappings":";AAiBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAW,OAAO,EAAc,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,qBACa,qBAAsB,SAAQ,WAAW;IAGlD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C,OAAO,CAAC,YAAY,CAAM;IAC1B,IAAI,WAAW,IAAI,MAAM,CAExB;IACD,IAAI,WAAW,CAAC,WAAW,EAAE,MAAM,EAGlC;IAED,OAAO,CAAC,OAAO,CAAM;IACrB,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAGxB;IAED,OAAO,CAAC,aAAa,CAAwC;IAC7D,IAAI,YAAY,IAAI,SAAS,0BAA0B,EAAE,CAExD;IACD,IAAI,YAAY,CAAC,YAAY,EAAE,SAAS,0BAA0B,EAAE,EAGnE;IAGD,SAAS,CAAC,IAAI,IAAI,IAAI;cAQH,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;cAKrC,MAAM,IAAI,KAAK,CAAC,SAAS;IAW5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6E;IAEhH,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE;IAa1D,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,0BAA0B,GAAG,KAAK,CAAC,SAAS;CAGvH;AAED,MAAM,WAAW,0BAA0B;IACvC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;CACxD"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js

@@ -0,0 +1,102 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorPaneHeader = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const React = require("@theia/core/shared/react");
+const browser_1 = require("@theia/core/lib/browser");
+const label_parser_1 = require("@theia/core/lib/browser/label-parser");
+let MergeEditorPaneHeader = class MergeEditorPaneHeader extends browser_1.ReactWidget {
+    constructor() {
+        super(...arguments);
+        this._description = '';
+        this._detail = '';
+        this.handleToolbarClick = (event) => event.nativeEvent.stopImmediatePropagation();
+    }
+    get description() {
+        return this._description;
+    }
+    set description(description) {
+        this._description = description;
+        this.update();
+    }
+    get detail() {
+        return this._detail;
+    }
+    set detail(detail) {
+        this._detail = detail;
+        this.update();
+    }
+    get toolbarItems() {
+        return this._toolbarItems;
+    }
+    set toolbarItems(toolbarItems) {
+        this._toolbarItems = toolbarItems;
+        this.update();
+    }
+    init() {
+        this.addClass('header');
+        this.scrollOptions = undefined;
+        this.node.tabIndex = -1;
+        this.toDispose.push((0, browser_1.onDomEvent)(this.node, 'click', () => this.activate()));
+        this.title.changed.connect(this.update, this);
+    }
+    onActivateRequest(msg) {
+        var _a;
+        super.onActivateRequest(msg);
+        (_a = this.parent) === null || _a === void 0 ? void 0 : _a.activate();
+    }
+    render() {
+        return (React.createElement(React.Fragment, null,
+            React.createElement("span", { className: 'title' }, this.renderWithIcons(this.title.label)),
+            React.createElement("span", { className: 'description' }, this.renderWithIcons(this.description)),
+            React.createElement("span", { className: 'detail' }, this.renderWithIcons(this.detail)),
+            React.createElement("span", { className: 'toolbar', onClick: this.handleToolbarClick }, this.toolbarItems.map(toolbarItem => this.renderToolbarItem(toolbarItem)))));
+    }
+    renderWithIcons(text) {
+        const result = [];
+        const labelParts = this.labelParser.parse(text);
+        labelParts.forEach((labelPart, index) => {
+            if (typeof labelPart === 'string') {
+                result.push(labelPart);
+            }
+            else {
+                result.push(React.createElement("span", { key: index, className: (0, browser_1.codicon)(labelPart.name) }));
+            }
+        });
+        return result;
+    }
+    renderToolbarItem({ id, label, tooltip, className, onClick }) {
+        return React.createElement("span", { key: id, title: tooltip, onClick: onClick, className: className }, label);
+    }
+};
+exports.MergeEditorPaneHeader = MergeEditorPaneHeader;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(label_parser_1.LabelParser),
+    tslib_1.__metadata("design:type", label_parser_1.LabelParser)
+], MergeEditorPaneHeader.prototype, "labelParser", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.postConstruct)(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], MergeEditorPaneHeader.prototype, "init", null);
+exports.MergeEditorPaneHeader = MergeEditorPaneHeader = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], MergeEditorPaneHeader);
+//# sourceMappingURL=merge-editor-pane-header.js.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-pane-header.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.tsx"],"names":[],"mappings":"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"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts

@@ -0,0 +1,49 @@
+import { DisposableCollection } from '@theia/core';
+import { Observable } from '@theia/core/lib/common/observable';
+import { BoxPanel, Message } from '@theia/core/lib/browser';
+import { EditorDecoration, EditorWidget, Position, Range } from '@theia/editor/lib/browser';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
+import { MergeEditor } from '../../merge-editor';
+import { MergeRange } from '../../model/merge-range';
+import { DetailedLineRangeMapping } from '../../model/range-mapping';
+import { LineRange } from '../../model/line-range';
+export declare abstract class MergeEditorPane extends BoxPanel {
+    readonly header: MergeEditorPaneHeader;
+    readonly editorWidget: EditorWidget;
+    private readonly m2p;
+    get editor(): MonacoEditor;
+    protected _mergeEditor: MergeEditor;
+    protected cursorPositionObservable: Observable<Position>;
+    protected cursorLineObservable: Observable<number>;
+    protected selectionObservable: Observable<Range[] | undefined>;
+    protected readonly toDispose: DisposableCollection;
+    constructor();
+    protected init(): void;
+    dispose(): void;
+    get mergeEditor(): MergeEditor;
+    set mergeEditor(mergeEditor: MergeEditor);
+    protected onAfterMergeEditorSet(): void;
+    get cursorPosition(): Position;
+    get cursorLine(): number;
+    get selection(): Range[] | undefined;
+    goToMergeRange(mergeRange: MergeRange, options?: {
+        reveal?: boolean;
+    }): void;
+    abstract getLineRangeForMergeRange(mergeRange: MergeRange): LineRange;
+    protected abstract translateBaseRange(range: Range): Range;
+    protected getToolbarItems(): MergeEditorPaneToolbarItem[];
+    protected computeEditorDecorations(): EditorDecoration[];
+    protected toMergeRangeDecoration(lineRange: LineRange, { isHandled, isFocused, isAfterEnd }: {
+        isHandled: boolean;
+        isFocused: boolean;
+        isAfterEnd: boolean;
+    }): EditorDecoration;
+    protected toChangeDecorations(changes: readonly DetailedLineRangeMapping[], { diffSide }: {
+        diffSide: 'original' | 'modified';
+    }): EditorDecoration[];
+    protected initContextKeys(): void;
+    protected initSelectionSynchronizer(): void;
+    protected onActivateRequest(msg: Message): void;
+}
+//# sourceMappingURL=merge-editor-pane.d.ts.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAc,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAA8B,UAAU,EAAuB,MAAM,mCAAmC,CAAC;AAChH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAsC,QAAQ,EAAE,KAAK,EAA0B,MAAM,2BAA2B,CAAC;AACxJ,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,8BACsB,eAAgB,SAAQ,QAAQ;IAGlD,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IAGvC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAGpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA4B;IAEhD,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC;IAEpC,SAAS,CAAC,wBAAwB,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzD,SAAS,CAAC,oBAAoB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACnD,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,KAAK,EAAE,GAAG,SAAS,CAAC,CAAC;IAE/D,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;;IAQ1D,SAAS,CAAC,IAAI,IAAI,IAAI;IAeb,OAAO,IAAI,IAAI;IAKxB,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,WAAW,CAAC,WAAW,EAAE,WAAW,EAMvC;IAED,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAwBvC,IAAI,cAAc,IAAI,QAAQ,CAE7B;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,SAAS,IAAI,KAAK,EAAE,GAAG,SAAS,CAEnC;IAED,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAU5E,QAAQ,CAAC,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;IAErE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAE1D,SAAS,CAAC,eAAe,IAAI,0BAA0B,EAAE;IAIzD,SAAS,CAAC,wBAAwB,IAAI,gBAAgB,EAAE;IAIxD,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,SAAS,EACjD,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,GACtG,gBAAgB;IA8BnB,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,wBAAwB,EAAE,EACtE,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,UAAU,GAAG,UAAU,CAAA;KAAE,GACpD,gBAAgB,EAAE;IA8BrB,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC,SAAS,CAAC,yBAAyB,IAAI,IAAI;cAkBxB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;CAI3D"}