@theia/scm 1.75.0-next.4 → 1.75.0-next.42

package/lib/browser/scm-history-graph-widget.spec.js

@@ -0,0 +1,262 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 Safi Seid-Ahmad, K2view 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 jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
+const disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const chai_1 = require("chai");
+const React = require("@theia/core/shared/react");
+const event_1 = require("@theia/core/lib/common/event");
+const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
+const scm_context_key_service_1 = require("./scm-context-key-service");
+const scm_history_graph_widget_1 = require("./scm-history-graph-widget");
+disableJSDOM();
+class MockContextKeyService extends context_key_service_1.ContextKeyServiceDummyImpl {
+    createKey(key, defaultValue) {
+        let value = defaultValue;
+        return {
+            set: (v) => { value = v; },
+            reset: () => { value = defaultValue; },
+            get: () => value
+        };
+    }
+}
+function createScmContextKeyService() {
+    const service = new scm_context_key_service_1.ScmContextKeyService();
+    service.contextKeyService = new MockContextKeyService();
+    service.init();
+    return service;
+}
+describe('ScmHistoryGraphWidget context keys', () => {
+    let restoreJSDOM;
+    let widget;
+    let scmContextKeys;
+    let provider;
+    let currentRefInFilter;
+    beforeEach(() => {
+        restoreJSDOM = (0, jsdom_1.enableJSDOM)();
+        scmContextKeys = createScmContextKeyService();
+        currentRefInFilter = true;
+        widget = new scm_history_graph_widget_1.ScmHistoryGraphWidget();
+        const raw = widget;
+        raw.scmContextKeys = scmContextKeys;
+        Object.defineProperty(raw, 'model', {
+            get: () => ({ provider, isCurrentRefInFilter: () => currentRefInFilter })
+        });
+    });
+    afterEach(() => {
+        restoreJSDOM();
+    });
+    function updateContextKeys() {
+        widget.updateContextKeys();
+    }
+    it('should set scmCurrentHistoryItemRefInFilter when the provider has a current ref', () => {
+        provider = {
+            currentHistoryItemRef: { id: 'refs/heads/main', name: 'main' }
+        };
+        updateContextKeys();
+        (0, chai_1.expect)(scmContextKeys.scmCurrentHistoryItemRefInFilter.get()).to.equal(true);
+    });
+    it('should clear scmCurrentHistoryItemRefInFilter when the provider has no current ref', () => {
+        scmContextKeys.scmCurrentHistoryItemRefInFilter.set(true);
+        provider = {};
+        updateContextKeys();
+        (0, chai_1.expect)(scmContextKeys.scmCurrentHistoryItemRefInFilter.get()).to.equal(false);
+    });
+    it('should clear scmCurrentHistoryItemRefInFilter when there is no provider', () => {
+        scmContextKeys.scmCurrentHistoryItemRefInFilter.set(true);
+        provider = undefined;
+        updateContextKeys();
+        (0, chai_1.expect)(scmContextKeys.scmCurrentHistoryItemRefInFilter.get()).to.equal(false);
+    });
+    it('should clear scmCurrentHistoryItemRefInFilter when the filter excludes the current ref', () => {
+        provider = {
+            currentHistoryItemRef: { id: 'refs/heads/main', name: 'main' }
+        };
+        currentRefInFilter = false;
+        updateContextKeys();
+        (0, chai_1.expect)(scmContextKeys.scmCurrentHistoryItemRefInFilter.get()).to.equal(false);
+    });
+    it('should set scmCurrentHistoryItemRefHasRemote when the provider has a remote ref', () => {
+        provider = {
+            currentHistoryItemRef: { id: 'refs/heads/main', name: 'main' },
+            currentHistoryItemRemoteRef: { id: 'refs/remotes/origin/main', name: 'origin/main' }
+        };
+        updateContextKeys();
+        (0, chai_1.expect)(scmContextKeys.scmCurrentHistoryItemRefHasRemote.get()).to.equal(true);
+    });
+});
+describe('ScmHistoryGraphWidget reveal', () => {
+    let restoreJSDOM;
+    let widget;
+    let requestReveal;
+    let scrolledTo;
+    beforeEach(() => {
+        restoreJSDOM = (0, jsdom_1.enableJSDOM)();
+        requestReveal = new event_1.Emitter();
+        scrolledTo = [];
+        widget = new scm_history_graph_widget_1.ScmHistoryGraphWidget();
+        const raw = widget;
+        raw.scmContextKeys = createScmContextKeyService();
+        raw.scmPreferences = { onPreferenceChanged: new event_1.Emitter().event };
+        raw.model = {
+            provider: undefined,
+            entries: [],
+            hasMore: false,
+            loading: false,
+            hasAttemptedLoad: true,
+            isCurrentRefInFilter: () => true,
+            onDidChange: new event_1.Emitter().event,
+            onDidRequestReveal: requestReveal.event
+        };
+        raw.listRef = { current: { scrollToIndex: (location) => scrolledTo.push(location) } };
+        // Rendering is out of scope here and would otherwise run asynchronously,
+        // after JSDOM has been torn down again.
+        raw.update = () => { };
+        widget.init();
+    });
+    afterEach(() => {
+        widget.dispose();
+        restoreJSDOM();
+    });
+    function selectedIndex() {
+        return widget.selectedIndex;
+    }
+    it('should scroll to the entry the model asks to reveal', () => {
+        requestReveal.fire(4);
+        (0, chai_1.expect)(scrolledTo).to.deep.equal([{ index: 4, align: 'center' }]);
+    });
+    it('should select the entry the model asks to reveal', () => {
+        requestReveal.fire(4);
+        (0, chai_1.expect)(selectedIndex()).to.equal(4);
+    });
+    it('should stop revealing once disposed', () => {
+        widget.dispose();
+        requestReveal.fire(4);
+        (0, chai_1.expect)(scrolledTo).to.be.empty;
+    });
+});
+const ROOT_URI = 'file:///repo';
+/** Builds the change rows of `commit-1` in the given view mode. */
+function renderChanges(widget, viewMode, paths) {
+    const raw = widget;
+    raw.model = { viewMode };
+    raw.scmService = { selectedRepository: { provider: { rootUri: ROOT_URI } } };
+    raw.labelProvider = { getIcon: () => 'file-icon' };
+    const changes = paths.map(path => ({
+        uri: `${ROOT_URI}/${path}`,
+        modifiedUri: `${ROOT_URI}/${path}`,
+        originalUri: `${ROOT_URI}/${path}`
+    }));
+    const graphRow = { lane: 0, color: 0, topColor: 0, edges: [], hasContinuation: false, hasTopLine: false };
+    const render = widget;
+    return render.renderChangesRows('commit-1', 22, graphRow, changes);
+}
+function allElements(node) {
+    const result = [];
+    const visit = (candidate) => {
+        if (Array.isArray(candidate)) {
+            candidate.forEach(visit);
+        }
+        else if (React.isValidElement(candidate)) {
+            result.push(candidate);
+            visit(candidate.props.children);
+        }
+    };
+    visit(node);
+    return result;
+}
+function elementsWithClass(node, className) {
+    return allElements(node).filter(element => {
+        const elementClass = element.props.className;
+        return typeof elementClass === 'string' && elementClass.includes(className);
+    });
+}
+/** The rendered name of a row — the `name scm-history-change-name` span it holds. */
+function nameOf(row) {
+    const name = allElements(row).find(element => element.props.className === 'name scm-history-change-name');
+    return String(name?.props?.children ?? '');
+}
+function folderLabels(rows) {
+    return elementsWithClass(rows, 'scm-history-change-folder-row').map(nameOf);
+}
+function fileNames(rows) {
+    return elementsWithClass(rows, 'scm-history-change-row')
+        .filter(row => !(row.props.className.includes('scm-history-change-folder-row')))
+        .map(nameOf);
+}
+describe('ScmHistoryGraphWidget change tree folders', () => {
+    let restoreJSDOM;
+    let widget;
+    beforeEach(() => {
+        restoreJSDOM = (0, jsdom_1.enableJSDOM)();
+        widget = new scm_history_graph_widget_1.ScmHistoryGraphWidget();
+        const raw = widget;
+        raw.update = () => { };
+    });
+    afterEach(() => {
+        widget.dispose();
+        restoreJSDOM();
+    });
+    function internals() {
+        return widget;
+    }
+    it('should show folders expanded by default', () => {
+        (0, chai_1.expect)(internals().isFolderCollapsed('commit-1', 'src')).to.be.false;
+    });
+    it('should collapse a folder on toggle', () => {
+        internals().toggleFolder('commit-1', 'src');
+        (0, chai_1.expect)(internals().isFolderCollapsed('commit-1', 'src')).to.be.true;
+    });
+    it('should expand a collapsed folder on toggle', () => {
+        internals().toggleFolder('commit-1', 'src');
+        internals().toggleFolder('commit-1', 'src');
+        (0, chai_1.expect)(internals().isFolderCollapsed('commit-1', 'src')).to.be.false;
+    });
+    it('should keep folder state separate per history item', () => {
+        internals().toggleFolder('commit-1', 'src');
+        (0, chai_1.expect)(internals().isFolderCollapsed('commit-2', 'src')).to.be.false;
+    });
+    it('should render a folder row per folder of the change tree', () => {
+        const rows = renderChanges(widget, 'tree', ['src/browser/a.ts', 'src/node/b.ts']);
+        (0, chai_1.expect)(folderLabels(rows)).to.deep.equal(['src', 'browser', 'node']);
+        (0, chai_1.expect)(fileNames(rows)).to.deep.equal(['a.ts', 'b.ts']);
+    });
+    it('should render expanded folders with a down twistie', () => {
+        const rows = renderChanges(widget, 'tree', ['src/a.ts']);
+        (0, chai_1.expect)(elementsWithClass(rows, 'codicon-chevron-down')).to.have.length(1);
+    });
+    it('should render a flat list of files without folder rows in list mode', () => {
+        const rows = renderChanges(widget, 'list', ['src/browser/a.ts', 'src/node/b.ts']);
+        (0, chai_1.expect)(folderLabels(rows)).to.be.empty;
+        (0, chai_1.expect)(fileNames(rows)).to.deep.equal(['a.ts', 'b.ts']);
+    });
+    it('should drop the files of a collapsed folder and turn its twistie', () => {
+        internals().toggleFolder('commit-1', 'src');
+        const rows = renderChanges(widget, 'tree', ['src/browser/a.ts', 'src/node/b.ts']);
+        (0, chai_1.expect)(folderLabels(rows)).to.deep.equal(['src']);
+        (0, chai_1.expect)(fileNames(rows)).to.be.empty;
+        (0, chai_1.expect)(elementsWithClass(rows, 'codicon-chevron-right')).to.have.length(1);
+    });
+    it('should forget folder state when the history item is collapsed again', () => {
+        const raw = widget;
+        raw.expandedIds.add('commit-1');
+        internals().toggleFolder('commit-1', 'src');
+        raw.handleRowClick(0, { item: { id: 'commit-1' } });
+        (0, chai_1.expect)(internals().collapsedFolders.has('commit-1')).to.be.false;
+    });
+});
+//# sourceMappingURL=scm-history-graph-widget.spec.js.map

package/lib/browser/scm-history-graph-widget.spec.js.map

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

package/lib/browser/scm-provider.d.ts

@@ -1,6 +1,7 @@
 import { Disposable, Event } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
+import { MarkdownString } from '@theia/core/lib/common/markdown-rendering/markdown-string';
 export interface ScmProvider extends Disposable {
     readonly id: string;
     readonly label: string;
@@ -105,7 +106,14 @@ export interface ScmHistoryItem {
     readonly authorIcon?: string;
     readonly displayId?: string;
     readonly timestamp?: number;
-    readonly tooltip?: string;
+    /**
+     * Hover content supplied by the provider. When present, it is rendered instead of the
+     * hover the history graph derives from the other fields, so that providers stay in control
+     * of their own links and commands. May be split into sections, which are rendered separated
+     * by horizontal rules. Note that `command:` links are only executed if the containing
+     * {@link MarkdownString} declares them via {@link MarkdownString.isTrusted}.
+     */
+    readonly tooltip?: string | MarkdownString | readonly MarkdownString[];
     readonly statistics?: ScmHistoryItemStatistics;
     readonly references?: readonly ScmHistoryItemRef[];
 }

package/lib/browser/scm-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scm-provider.d.ts","sourceRoot":"","sources":["../../src/browser/scm-provider.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC3C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,UAAU,CAAC;IAEzC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAE5C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,CAAC;IAC1C,QAAQ,CAAC,4BAA4B,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,GAAG,SAAS,CAAC,CAAC;IAExE,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAElD,QAAQ,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC;IAExC,QAAQ,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC;IACxC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;IAEtE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAEvC,QAAQ,CAAC,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACjD;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAChD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;CAClC;AAED,MAAM,WAAW,WAAW;IACxB,+DAA+D;IAC/D,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,sBAAsB,CAAC;IAC9C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;CACpC;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACvC;AAED,MAAM,WAAW,eAAe;IAC5B,yBAAyB,CAAC,oBAAoB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;IACjH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,aAAa,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,UAAU,CAAC;IACpB,iBAAiB,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,6BAA6B;IAC1C,QAAQ,CAAC,KAAK,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC/C,QAAQ,CAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAC;CACnD;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,wBAAwB;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;CACtD;AAED,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IAC/B,QAAQ,CAAC,qBAAqB,CAAC,EAAE,iBAAiB,CAAC;IACnD,QAAQ,CAAC,2BAA2B,CAAC,EAAE,iBAAiB,CAAC;IACzD,QAAQ,CAAC,yBAAyB,CAAC,EAAE,iBAAiB,CAAC;IACvD,QAAQ,CAAC,iCAAiC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACxD,QAAQ,CAAC,0BAA0B,EAAE,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAE1E,sBAAsB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,EAAE,GAAG,SAAS,CAAC,CAAC;IAClI,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,CAAC;IACjH,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,GAAG,SAAS,CAAC,CAAC;IACjK,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IACzG,oCAAoC,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1H"}
+{"version":3,"file":"scm-provider.d.ts","sourceRoot":"","sources":["../../src/browser/scm-provider.ts"],"names":[],"mappings":"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"}

package/lib/browser/scm-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"scm-provider.js","sourceRoot":"","sources":["../../src/browser/scm-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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;;;AAmCnE,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"scm-provider.js","sourceRoot":"","sources":["../../src/browser/scm-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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;;;AAoCnE,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}

package/lib/common/scm-preferences.d.ts

@@ -3,6 +3,9 @@ import { PreferenceProxy, PreferenceSchema, PreferenceService } from '@theia/cor
 export declare const scmPreferenceSchema: PreferenceSchema;
 export interface ScmConfiguration {
     'scm.defaultViewMode': 'tree' | 'list';
+    'scm.graph.badges': 'all' | 'filter';
+    'scm.graph.pageOnScroll': boolean;
+    'scm.graph.pageSize': number;
 }
 export declare const ScmPreferenceContribution: unique symbol;
 export declare const ScmPreferences: unique symbol;

package/lib/common/scm-preferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scm-preferences.d.ts","sourceRoot":"","sources":["../../src/common/scm-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAGH,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACpB,MAAM,oCAAoC,CAAC;AAG5C,eAAO,MAAM,mBAAmB,EAAE,gBAajC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC7B,qBAAqB,EAAE,MAAM,GAAG,MAAM,CAAA;CACzC;AAED,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;AAE/D,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,GAAE,gBAAsC,GAAG,cAAc,CAEnI;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQ9D"}
+{"version":3,"file":"scm-preferences.d.ts","sourceRoot":"","sources":["../../src/common/scm-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAGH,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACpB,MAAM,oCAAoC,CAAC;AAG5C,eAAO,MAAM,mBAAmB,EAAE,gBAqCjC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC7B,qBAAqB,EAAE,MAAM,GAAG,MAAM,CAAA;IACtC,kBAAkB,EAAE,KAAK,GAAG,QAAQ,CAAA;IACpC,wBAAwB,EAAE,OAAO,CAAA;IACjC,oBAAoB,EAAE,MAAM,CAAA;CAC/B;AAED,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;AAE/D,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,GAAE,gBAAsC,GAAG,cAAc,CAEnI;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQ9D"}

package/lib/common/scm-preferences.js

@@ -31,6 +31,30 @@ exports.scmPreferenceSchema = {
             ],
             description: nls_1.nls.localizeByDefault('Controls the default Source Control repository view mode.'),
             default: 'list'
+        },
+        'scm.graph.badges': {
+            type: 'string',
+            enum: ['all', 'filter'],
+            enumDescriptions: [
+                nls_1.nls.localizeByDefault('Show badges of all history item groups in the Source Control Graph view.'),
+                nls_1.nls.localizeByDefault('Show only the badges of history item groups used as a filter in the Source Control Graph view.')
+            ],
+            description: nls_1.nls.localizeByDefault(
+            // eslint-disable-next-line max-len
+            'Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups.'),
+            default: 'filter'
+        },
+        'scm.graph.pageOnScroll': {
+            type: 'boolean',
+            description: nls_1.nls.localizeByDefault('Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list.'),
+            default: true
+        },
+        'scm.graph.pageSize': {
+            type: 'number',
+            minimum: 1,
+            maximum: 1000,
+            description: nls_1.nls.localizeByDefault('The number of items to show in the Source Control Graph view by default and when loading more items.'),
+            default: 50
         }
     }
 };

package/lib/common/scm-preferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"scm-preferences.js","sourceRoot":"","sources":["../../src/common/scm-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;AAmChF,oDAEC;AAED,gDAQC;AA5CD,oEAM4C;AAC5C,oDAAiD;AAEpC,QAAA,mBAAmB,GAAqB;IACjD,UAAU,EAAE;QACR,qBAAqB,EAAE;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YACtB,gBAAgB,EAAE;gBACd,SAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;gBAC/D,SAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;aAClE;YACD,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,2DAA2D,CAAC;YAC/F,OAAO,EAAE,MAAM;SAClB;KACJ;CACJ,CAAC;AAMW,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAChE,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAGvD,SAAgB,oBAAoB,CAAC,WAA8B,EAAE,SAA2B,2BAAmB;IAC/G,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAqB;IACpD,IAAI,CAAC,sBAAc,CAAC,CAAC,cAAc,CAAC,CAAC,GAAuB,EAAE,EAAE;QAC5D,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,iCAAyB,CAAC,CAAC;QAC1F,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,iCAAyB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,2BAAmB,EAAE,CAAC,CAAC;IACjF,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,iCAAyB,CAAC,CAAC;AACtE,CAAC"}
+{"version":3,"file":"scm-preferences.js","sourceRoot":"","sources":["../../src/common/scm-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;AA8DhF,oDAEC;AAED,gDAQC;AAvED,oEAM4C;AAC5C,oDAAiD;AAEpC,QAAA,mBAAmB,GAAqB;IACjD,UAAU,EAAE;QACR,qBAAqB,EAAE;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YACtB,gBAAgB,EAAE;gBACd,SAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;gBAC/D,SAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;aAClE;YACD,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,2DAA2D,CAAC;YAC/F,OAAO,EAAE,MAAM;SAClB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YACvB,gBAAgB,EAAE;gBACd,SAAG,CAAC,iBAAiB,CAAC,0EAA0E,CAAC;gBACjG,SAAG,CAAC,iBAAiB,CAAC,gGAAgG,CAAC;aAC1H;YACD,WAAW,EAAE,SAAG,CAAC,iBAAiB;YAC9B,mCAAmC;YACnC,oKAAoK,CAAC;YACzK,OAAO,EAAE,QAAQ;SACpB;QACD,wBAAwB,EAAE;YACtB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,yHAAyH,CAAC;YAC7J,OAAO,EAAE,IAAI;SAChB;QACD,oBAAoB,EAAE;YAClB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,sGAAsG,CAAC;YAC1I,OAAO,EAAE,EAAE;SACd;KACJ;CACJ,CAAC;AASW,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAChE,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAGvD,SAAgB,oBAAoB,CAAC,WAA8B,EAAE,SAA2B,2BAAmB;IAC/G,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAqB;IACpD,IAAI,CAAC,sBAAc,CAAC,CAAC,cAAc,CAAC,CAAC,GAAuB,EAAE,EAAE;QAC5D,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,iCAAyB,CAAC,CAAC;QAC1F,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,iCAAyB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,2BAAmB,EAAE,CAAC,CAAC;IACjF,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,iCAAyB,CAAC,CAAC;AACtE,CAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@theia/scm",
-  "version": "1.75.0-next.4+6b2d0e17a",
+  "version": "1.75.0-next.42+a35c2a27e",
   "description": "Theia - Source control Extension",
   "dependencies": {
-    "@theia/core": "1.75.0-next.4+6b2d0e17a",
-    "@theia/editor": "1.75.0-next.4+6b2d0e17a",
-    "@theia/filesystem": "1.75.0-next.4+6b2d0e17a",
-    "@theia/monaco": "1.75.0-next.4+6b2d0e17a",
+    "@theia/core": "1.75.0-next.42+a35c2a27e",
+    "@theia/editor": "1.75.0-next.42+a35c2a27e",
+    "@theia/filesystem": "1.75.0-next.42+a35c2a27e",
+    "@theia/monaco": "1.75.0-next.42+a35c2a27e",
     "@theia/monaco-editor-core": "1.108.201",
     "@types/diff": "^5.2.3",
     "diff": "^5.2.2",
@@ -55,5 +55,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "6b2d0e17a0d40afdda8c17600ade9c5950899871"
+  "gitHead": "a35c2a27e7d62cc83409f5996cbb076adc61d667"
 }

package/src/browser/decorations/scm-navigator-decorator.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import { Tree } from '@theia/core/lib/browser/tree/tree';
@@ -35,7 +35,8 @@ export class ScmNavigatorDecorator implements TreeDecorator {
     readonly id = 'theia-scm-decorator';
     private decorationsMap: Map<string, Decoration> | undefined;
 
-    @inject(ILogger) protected readonly logger: ILogger;
+    @inject(ILogger) @named('scm:ScmNavigatorDecorator')
+    protected readonly logger: ILogger;
 
     @inject(ColorRegistry)
     protected readonly colors: ColorRegistry;

package/src/browser/scm-context-key-service.spec.ts

@@ -69,6 +69,15 @@ describe('ScmContextKeyService', () => {
         scmContextKeyService.scmProviderCount.reset();
         expect(scmContextKeyService.scmProviderCount.get()).to.equal(0);
     });
+
+    it('should initialize scmCurrentHistoryItemRefInFilter to false', () => {
+        expect(scmContextKeyService.scmCurrentHistoryItemRefInFilter.get()).to.equal(false);
+    });
+
+    it('should update scmCurrentHistoryItemRefInFilter when set is called', () => {
+        scmContextKeyService.scmCurrentHistoryItemRefInFilter.set(true);
+        expect(scmContextKeyService.scmCurrentHistoryItemRefInFilter.get()).to.equal(true);
+    });
 });
 
 describe('ScmContribution scm.providerCount wiring', () => {

package/src/browser/scm-context-key-service.ts

@@ -63,6 +63,11 @@ export class ScmContextKeyService {
         return this._scmCurrentHistoryItemRefHasBase;
     }
 
+    protected _scmCurrentHistoryItemRefInFilter: ContextKey<boolean>;
+    get scmCurrentHistoryItemRefInFilter(): ContextKey<boolean> {
+        return this._scmCurrentHistoryItemRefInFilter;
+    }
+
     @postConstruct()
     protected init(): void {
         this._scmProvider = this.contextKeyService.createKey<string | undefined>('scmProvider', undefined);
@@ -73,6 +78,7 @@ export class ScmContextKeyService {
         this._scmHistoryItemRef = this.contextKeyService.createKey<string | undefined>('scmHistoryItemRef', undefined);
         this._scmCurrentHistoryItemRefHasRemote = this.contextKeyService.createKey<boolean>('scmCurrentHistoryItemRefHasRemote', false);
         this._scmCurrentHistoryItemRefHasBase = this.contextKeyService.createKey<boolean>('scmCurrentHistoryItemRefHasBase', false);
+        this._scmCurrentHistoryItemRefInFilter = this.contextKeyService.createKey<boolean>('scmCurrentHistoryItemRefInFilter', false);
     }
 
     match(expression: string | undefined): boolean {

package/src/browser/scm-frontend-module.ts

@@ -46,7 +46,9 @@ import { bindScmPreferences } from '../common/scm-preferences';
 import { bindMergeEditor } from './merge-editor/merge-editor-module';
 import { ScmRepositoriesWidget } from './scm-repositories-widget';
 import { ScmHistoryGraphWidget } from './scm-history-graph-widget';
-import { ScmHistoryGraphModel } from './scm-history-graph-model';
+import { ScmHistoryGraphModel, ScmHistoryGraphModelProvider } from './scm-history-graph-model';
+import { ScmHistoryGraphContribution } from './scm-history-graph-contribution';
+import { CommandContribution, MenuContribution } from '@theia/core';
 
 export default new ContainerModule(bind => {
     bind(ScmContextKeyService).toSelf().inSingletonScope();
@@ -91,6 +93,10 @@ export default new ContainerModule(bind => {
     })).inSingletonScope();
 
     bind(ScmHistoryGraphModel).toSelf().inSingletonScope();
+    bind(ScmHistoryGraphModelProvider).toFactory(ctx => () => ctx.container.get(ScmHistoryGraphModel));
+    bind(ScmHistoryGraphContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(ScmHistoryGraphContribution);
+    bind(MenuContribution).toService(ScmHistoryGraphContribution);
     bind(ScmHistoryGraphWidget).toSelf();
     bind(WidgetFactory).toDynamicValue(({ container }) => ({
         id: ScmHistoryGraphWidget.ID,