@codingame/monaco-vscode-scm-service-override 9.0.3 → 10.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/scm.css.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, HISTORY_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
@@ -26,7 +26,17 @@ let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer
         return 400;
     }
     getTitle() {
-        return ( localize(6335, "Source Control"));
+        if (this.panes.length === 1) {
+            if (this.panes[0].id === VIEW_PANE_ID ||
+                this.panes[0].id === REPOSITORIES_VIEW_PANE_ID ||
+                this.panes[0].id === HISTORY_VIEW_PANE_ID) {
+                return this.panes[0].title;
+            }
+            else {
+                return super.getTitle();
+            }
+        }
+        return ( localize(6601, "Source Control"));
     }
 };
 SCMViewPaneContainer = ( (__decorate([

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js

@@ -1,12 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
-import { ISCMRepositorySortKey } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { SCMMenus } from './menus.js';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { debounce } from 'vscode/vscode/vs/base/common/decorators';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
@@ -17,6 +15,12 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import { derivedOpts } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/cancellation';
+import { observableFromEventOpts, derivedObservableWithCache, latestChangedValue } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 
 function getProviderStorageKey(provider) {
     return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
@@ -29,14 +33,17 @@ function getRepositoryName(workspaceContextService, repository) {
     return folder?.uri.toString() === ( repository.provider.rootUri.toString()) ? folder.name : basename(repository.provider.rootUri);
 }
 const RepositoryContextKeys = {
-    RepositorySortKey: ( new RawContextKey('scmRepositorySortKey', ISCMRepositorySortKey.DiscoveryTime)),
+    RepositorySortKey: ( new RawContextKey(
+        'scmRepositorySortKey',
+        "discoveryTime"
+    )),
 };
 let SCMViewService = class SCMViewService {
     get repositories() {
         return ( this._repositories.map(r => r.repository));
     }
     get visibleRepositories() {
-        if (this._repositoriesSortKey === ISCMRepositorySortKey.DiscoveryTime) {
+        if (this._repositoriesSortKey === "discoveryTime" ) {
             return ( this._repositories.filter(r => r.selectionIndex !== -1)
                 .sort((r1, r2) => r1.selectionIndex - r2.selectionIndex)
                 .map(r => r.repository));
@@ -72,7 +79,9 @@ let SCMViewService = class SCMViewService {
     get focusedRepository() {
         return this._repositories.find(r => r.focused)?.repository;
     }
-    constructor(scmService, contextKeyService, extensionService, instantiationService, configurationService, storageService, workspaceContextService) {
+    constructor(scmService, contextKeyService, editorService, extensionService, instantiationService, configurationService, storageService, workspaceContextService) {
+        this.scmService = scmService;
+        this.editorService = editorService;
         this.configurationService = configurationService;
         this.storageService = storageService;
         this.workspaceContextService = workspaceContextService;
@@ -109,9 +118,27 @@ let SCMViewService = class SCMViewService {
         }, 0, undefined, undefined, undefined, this.disposables));
         this._onDidFocusRepository = ( new Emitter());
         this.onDidFocusRepository = this._onDidFocusRepository.event;
+        this._focusedRepository = observableFromEventOpts({ owner: this, equalsFn: () => false }, this.onDidFocusRepository, () => this.focusedRepository);
+        this._activeEditor = observableFromEventOpts({ owner: this, equalsFn: () => false }, this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
+        this._activeEditorRepository = derivedObservableWithCache(this, (reader, lastValue) => {
+            const activeResource = EditorResourceAccessor.getOriginalUri(this._activeEditor.read(reader));
+            if (!activeResource) {
+                return lastValue;
+            }
+            const repository = this.scmService.getRepository(activeResource);
+            if (!repository) {
+                return lastValue;
+            }
+            return Object.create(repository);
+        });
+        this._activeRepository = latestChangedValue(this, [this._activeEditorRepository, this._focusedRepository]);
+        this.activeRepository = derivedOpts({
+            owner: this,
+            equalsFn: (r1, r2) => r1?.id === r2?.id
+        }, reader => this._activeRepository.read(reader));
         this.menus = instantiationService.createInstance(SCMMenus);
         try {
-            this.previousState = JSON.parse(storageService.get('scm:view:visibleRepositories', StorageScope.WORKSPACE, ''));
+            this.previousState = JSON.parse(storageService.get('scm:view:visibleRepositories', 1 , ''));
         }
         catch {
         }
@@ -235,7 +262,7 @@ let SCMViewService = class SCMViewService {
         }
     }
     compareRepositories(op1, op2) {
-        if (this._repositoriesSortKey === ISCMRepositorySortKey.DiscoveryTime) {
+        if (this._repositoriesSortKey === "discoveryTime" ) {
             return op1.discoveryTime - op2.discoveryTime;
         }
         if (this._repositoriesSortKey === 'path' && op1.repository.provider.rootUri && op2.repository.provider.rootUri) {
@@ -257,13 +284,13 @@ let SCMViewService = class SCMViewService {
         const sortOder = this.configurationService.getValue('scm.repositories.sortOrder');
         switch (sortOder) {
             case 'discovery time':
-                return ISCMRepositorySortKey.DiscoveryTime;
+                return "discoveryTime" ;
             case 'name':
-                return ISCMRepositorySortKey.Name;
+                return "name" ;
             case 'path':
-                return ISCMRepositorySortKey.Path;
+                return "path" ;
             default:
-                return ISCMRepositorySortKey.DiscoveryTime;
+                return "discoveryTime" ;
         }
     }
     insertRepositoryView(repositories, repositoryView) {
@@ -277,7 +304,7 @@ let SCMViewService = class SCMViewService {
         const all = ( this.repositories.map(r => getProviderStorageKey(r.provider)));
         const visible = ( this.visibleRepositories.map(r => all.indexOf(getProviderStorageKey(r.provider))));
         this.previousState = { all, sortKey: this._repositoriesSortKey, visible };
-        this.storageService.store('scm:view:visibleRepositories', JSON.stringify(this.previousState), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.storageService.store('scm:view:visibleRepositories', JSON.stringify(this.previousState), 1 , 1 );
     }
     eventuallyFinishLoading() {
         this.finishLoading();
@@ -300,11 +327,12 @@ SCMViewService.__decorator = ( __decorate([
 SCMViewService = ( __decorate([
     ( __param(0, ISCMService)),
     ( __param(1, IContextKeyService)),
-    ( __param(2, IExtensionService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, IStorageService)),
-    ( __param(6, IWorkspaceContextService))
+    ( __param(2, IEditorService)),
+    ( __param(3, IExtensionService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, IStorageService)),
+    ( __param(7, IWorkspaceContextService))
 ], SCMViewService));
 
 export { RepositoryContextKeys, SCMViewService };

package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js

@@ -1,18 +1,17 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/event';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { getProviderKey } from './util.js';
+import { getProviderKey } from 'vscode/vscode/vs/workbench/contrib/scm/browser/util';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 
 let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
@@ -28,7 +27,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
         this._repositoryDisposables = ( new DisposableMap());
         this._store.add(autorunWithStore((reader, store) => {
             if (!this._enabledConfig.read(reader)) {
-                this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);
+                this.storageService.remove('scm.workingSets', 1 );
                 this._repositoryDisposables.clearAndDisposeAll();
                 return;
             }
@@ -42,23 +41,27 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
     }
     _onDidAddRepository(repository) {
         const disposables = ( new DisposableStore());
-        disposables.add(autorun(async (reader) => {
+        const historyItemRefId = derived(reader => {
             const historyProvider = repository.provider.historyProvider.read(reader);
-            const currentHistoryItemGroupId = historyProvider?.currentHistoryItemGroupId.read(reader);
-            if (!currentHistoryItemGroupId) {
+            const historyItemRef = historyProvider?.historyItemRef.read(reader);
+            return historyItemRef?.id;
+        });
+        disposables.add(autorun(async (reader) => {
+            const historyItemRefIdValue = historyItemRefId.read(reader);
+            if (!historyItemRefIdValue) {
                 return;
             }
             const providerKey = getProviderKey(repository.provider);
             const repositoryWorkingSets = this._workingSets.get(providerKey);
             if (!repositoryWorkingSets) {
-                this._workingSets.set(providerKey, { currentHistoryItemGroupId, editorWorkingSets: ( new Map()) });
+                this._workingSets.set(providerKey, { currentHistoryItemGroupId: historyItemRefIdValue, editorWorkingSets: ( new Map()) });
                 return;
             }
-            if (repositoryWorkingSets.currentHistoryItemGroupId === currentHistoryItemGroupId) {
+            if (repositoryWorkingSets.currentHistoryItemGroupId === historyItemRefIdValue) {
                 return;
             }
-            this._saveWorkingSet(providerKey, currentHistoryItemGroupId, repositoryWorkingSets);
-            await this._restoreWorkingSet(providerKey, currentHistoryItemGroupId);
+            this._saveWorkingSet(providerKey, historyItemRefIdValue, repositoryWorkingSets);
+            await this._restoreWorkingSet(providerKey, historyItemRefIdValue);
         }));
         this._repositoryDisposables.set(repository, disposables);
     }
@@ -67,7 +70,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
     }
     _loadWorkingSets() {
         const workingSets = ( new Map());
-        const workingSetsRaw = this.storageService.get('scm.workingSets', StorageScope.WORKSPACE);
+        const workingSetsRaw = this.storageService.get('scm.workingSets', 1 );
         if (!workingSetsRaw) {
             return workingSets;
         }
@@ -88,7 +91,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
         for (const [providerKey, { currentHistoryItemGroupId, editorWorkingSets }] of this._workingSets) {
             workingSets.push({ providerKey, currentHistoryItemGroupId, editorWorkingSets: [...editorWorkingSets] });
         }
-        this.storageService.store('scm.workingSets', JSON.stringify(workingSets), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.storageService.store('scm.workingSets', JSON.stringify(workingSets), 1 , 1 );
     }
     async _restoreWorkingSet(providerKey, currentHistoryItemGroupId) {
         const workingSets = this._workingSets.get(providerKey);
@@ -100,7 +103,7 @@ let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
             editorWorkingSetId = 'empty';
         }
         if (editorWorkingSetId) {
-            const preserveFocus = this.layoutService.hasFocus(Parts.PANEL_PART);
+            const preserveFocus = this.layoutService.hasFocus("workbench.parts.panel" );
             await this.editorGroupsService.applyWorkingSet(editorWorkingSetId, { preserveFocus });
         }
     }

package/vscode/src/vs/workbench/contrib/scm/common/scmService.js

@@ -4,7 +4,6 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { HistoryNavigator2 } from 'vscode/vscode/vs/base/common/history';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
@@ -173,7 +172,7 @@ let SCMInputHistory = class SCMInputHistory {
         this._onWillSaveHistory = this.disposables.add(( new Emitter()));
         this.onWillSaveHistory = this._onWillSaveHistory.event;
         this.histories = ( new Map());
-        const entries = this.storageService.getObject('scm.history', StorageScope.WORKSPACE, []);
+        const entries = this.storageService.getObject('scm.history', 1 , []);
         for (const [providerLabel, rootUri, history] of entries) {
             let providerHistories = this.histories.get(providerLabel);
             if (!providerHistories) {
@@ -185,9 +184,9 @@ let SCMInputHistory = class SCMInputHistory {
         if (this.migrateStorage()) {
             this.saveToStorage();
         }
-        this.disposables.add(this.storageService.onDidChangeValue(StorageScope.WORKSPACE, 'scm.history', this.disposables)(e => {
+        this.disposables.add(this.storageService.onDidChangeValue(1 , 'scm.history', this.disposables)(e => {
             if (e.external && e.key === 'scm.history') {
-                const raw = this.storageService.getObject('scm.history', StorageScope.WORKSPACE, []);
+                const raw = this.storageService.getObject('scm.history', 1 , []);
                 for (const [providerLabel, uri, rawHistory] of raw) {
                     const history = this.getHistory(providerLabel, uri);
                     for (const value of Iterable.reverse(rawHistory)) {
@@ -213,7 +212,7 @@ let SCMInputHistory = class SCMInputHistory {
                 }
             }
         }
-        this.storageService.store('scm.history', raw, StorageScope.WORKSPACE, StorageTarget.USER);
+        this.storageService.store('scm.history', raw, 1 , 0 );
     }
     getHistory(providerLabel, rootUri) {
         let providerHistories = this.histories.get(providerLabel);
@@ -230,13 +229,13 @@ let SCMInputHistory = class SCMInputHistory {
     }
     migrateStorage() {
         let didSomethingChange = false;
-        const machineKeys = Iterable.filter(( this.storageService.keys(StorageScope.APPLICATION, StorageTarget.MACHINE)), key => key.startsWith('scm/input:'));
+        const machineKeys = Iterable.filter(( this.storageService.keys(-1, 1 )), key => key.startsWith('scm/input:'));
         for (const key of machineKeys) {
             try {
-                const legacyHistory = JSON.parse(this.storageService.get(key, StorageScope.APPLICATION, ''));
+                const legacyHistory = JSON.parse(this.storageService.get(key, -1 , ''));
                 const match = /^scm\/input:([^:]+):(.+)$/.exec(key);
                 if (!match || !Array.isArray(legacyHistory?.history) || !Number.isInteger(legacyHistory?.timestamp)) {
-                    this.storageService.remove(key, StorageScope.APPLICATION);
+                    this.storageService.remove(key, -1 );
                     continue;
                 }
                 const [, providerLabel, rootPath] = match;
@@ -247,11 +246,11 @@ let SCMInputHistory = class SCMInputHistory {
                         history.prepend(entry);
                     }
                     didSomethingChange = true;
-                    this.storageService.remove(key, StorageScope.APPLICATION);
+                    this.storageService.remove(key, -1 );
                 }
             }
             catch {
-                this.storageService.remove(key, StorageScope.APPLICATION);
+                this.storageService.remove(key, -1 );
             }
         }
         return didSomethingChange;

package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js

@@ -1,222 +0,0 @@
-import { localize } from 'vscode/vscode/vs/nls';
-import { lastOrDefault } from 'vscode/vscode/vs/base/common/arrays';
-import { deepClone } from 'vscode/vscode/vs/base/common/objects';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { registerColor, asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
-import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
-import { chartsBlue, chartsPurple, chartsOrange, chartsGreen, chartsRed, chartsYellow } from 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
-import { buttonForeground } from 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { rot } from 'vscode/vscode/vs/base/common/numbers';
-import { svgElem } from 'vscode/vscode/vs/base/browser/dom';
-
-const SWIMLANE_HEIGHT = 22;
-const SWIMLANE_WIDTH = 11;
-const CIRCLE_RADIUS = 4;
-const SWIMLANE_CURVE_RADIUS = 5;
-const historyItemGroupLocal = registerColor('scmGraph.historyItemGroupLocal', chartsBlue, ( localize(10471, "Local history item group color.")));
-const historyItemGroupRemote = registerColor('scmGraph.historyItemGroupRemote', chartsPurple, ( localize(10472, "Remote history item group color.")));
-const historyItemGroupBase = registerColor('scmGraph.historyItemGroupBase', chartsOrange, ( localize(10473, "Base history item group color.")));
-const historyItemGroupHoverLabelForeground = registerColor('scmGraph.historyItemHoverLabelForeground', buttonForeground, ( localize(10474, "History item hover label foreground color.")));
-const colorRegistry = [
-    registerColor('scmGraph.foreground1', chartsGreen, ( localize(10475, "Source control graph foreground color (1)."))),
-    registerColor('scmGraph.foreground2', chartsRed, ( localize(10476, "Source control graph foreground color (2)."))),
-    registerColor('scmGraph.foreground3', chartsYellow, ( localize(10477, "Source control graph foreground color (3)."))),
-];
-function getLabelColorIdentifier(historyItem, colorMap) {
-    for (const label of historyItem.labels ?? []) {
-        const colorIndex = colorMap.get(label.title);
-        if (colorIndex !== undefined) {
-            return colorIndex;
-        }
-    }
-    return undefined;
-}
-function createPath(colorIdentifier) {
-    const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-    path.setAttribute('fill', 'none');
-    path.setAttribute('stroke-width', '1px');
-    path.setAttribute('stroke-linecap', 'round');
-    path.style.stroke = asCssVariable(colorIdentifier);
-    return path;
-}
-function drawCircle(index, radius, colorIdentifier) {
-    const circle = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
-    circle.setAttribute('cx', `${SWIMLANE_WIDTH * (index + 1)}`);
-    circle.setAttribute('cy', `${SWIMLANE_WIDTH}`);
-    circle.setAttribute('r', `${radius}`);
-    circle.style.fill = asCssVariable(colorIdentifier);
-    return circle;
-}
-function drawVerticalLine(x1, y1, y2, color) {
-    const path = createPath(color);
-    path.setAttribute('d', `M ${x1} ${y1} V ${y2}`);
-    return path;
-}
-function findLastIndex(nodes, id) {
-    for (let i = nodes.length - 1; i >= 0; i--) {
-        if (nodes[i].id === id) {
-            return i;
-        }
-    }
-    return -1;
-}
-function renderSCMHistoryItemGraph(historyItemViewModel) {
-    const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
-    svg.classList.add('graph');
-    const historyItem = historyItemViewModel.historyItem;
-    const inputSwimlanes = historyItemViewModel.inputSwimlanes;
-    const outputSwimlanes = historyItemViewModel.outputSwimlanes;
-    const inputIndex = inputSwimlanes.findIndex(node => node.id === historyItem.id);
-    const circleIndex = inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
-    const circleColor = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color :
-        circleIndex < inputSwimlanes.length ? inputSwimlanes[circleIndex].color : historyItemGroupLocal;
-    let outputSwimlaneIndex = 0;
-    for (let index = 0; index < inputSwimlanes.length; index++) {
-        const color = inputSwimlanes[index].color;
-        if (inputSwimlanes[index].id === historyItem.id) {
-            if (index !== circleIndex) {
-                const d = [];
-                const path = createPath(color);
-                d.push(`M ${SWIMLANE_WIDTH * (index + 1)} 0`);
-                d.push(`A ${SWIMLANE_WIDTH} ${SWIMLANE_WIDTH} 0 0 1 ${SWIMLANE_WIDTH * (index)} ${SWIMLANE_WIDTH}`);
-                d.push(`H ${SWIMLANE_WIDTH * (circleIndex + 1)}`);
-                path.setAttribute('d', d.join(' '));
-                svg.append(path);
-            }
-            else {
-                outputSwimlaneIndex++;
-            }
-        }
-        else {
-            if (outputSwimlaneIndex < outputSwimlanes.length &&
-                inputSwimlanes[index].id === outputSwimlanes[outputSwimlaneIndex].id) {
-                if (index === outputSwimlaneIndex) {
-                    const path = drawVerticalLine(SWIMLANE_WIDTH * (index + 1), 0, SWIMLANE_HEIGHT, color);
-                    svg.append(path);
-                }
-                else {
-                    const d = [];
-                    const path = createPath(color);
-                    d.push(`M ${SWIMLANE_WIDTH * (index + 1)} 0`);
-                    d.push(`V 6`);
-                    d.push(`A ${SWIMLANE_CURVE_RADIUS} ${SWIMLANE_CURVE_RADIUS} 0 0 1 ${(SWIMLANE_WIDTH * (index + 1)) - SWIMLANE_CURVE_RADIUS} ${SWIMLANE_HEIGHT / 2}`);
-                    d.push(`H ${(SWIMLANE_WIDTH * (outputSwimlaneIndex + 1)) + SWIMLANE_CURVE_RADIUS}`);
-                    d.push(`A ${SWIMLANE_CURVE_RADIUS} ${SWIMLANE_CURVE_RADIUS} 0 0 0 ${SWIMLANE_WIDTH * (outputSwimlaneIndex + 1)} ${(SWIMLANE_HEIGHT / 2) + SWIMLANE_CURVE_RADIUS}`);
-                    d.push(`V ${SWIMLANE_HEIGHT}`);
-                    path.setAttribute('d', d.join(' '));
-                    svg.append(path);
-                }
-                outputSwimlaneIndex++;
-            }
-        }
-    }
-    for (let i = 1; i < historyItem.parentIds.length; i++) {
-        const parentOutputIndex = findLastIndex(outputSwimlanes, historyItem.parentIds[i]);
-        if (parentOutputIndex === -1) {
-            continue;
-        }
-        const d = [];
-        const path = createPath(outputSwimlanes[parentOutputIndex].color);
-        d.push(`M ${SWIMLANE_WIDTH * parentOutputIndex} ${SWIMLANE_HEIGHT / 2}`);
-        d.push(`A ${SWIMLANE_WIDTH} ${SWIMLANE_WIDTH} 0 0 1 ${SWIMLANE_WIDTH * (parentOutputIndex + 1)} ${SWIMLANE_HEIGHT}`);
-        d.push(`M ${SWIMLANE_WIDTH * parentOutputIndex} ${SWIMLANE_HEIGHT / 2}`);
-        d.push(`H ${SWIMLANE_WIDTH * (circleIndex + 1)} `);
-        path.setAttribute('d', d.join(' '));
-        svg.append(path);
-    }
-    if (inputIndex !== -1) {
-        const path = drawVerticalLine(SWIMLANE_WIDTH * (circleIndex + 1), 0, SWIMLANE_HEIGHT / 2, inputSwimlanes[inputIndex].color);
-        svg.append(path);
-    }
-    if (historyItem.parentIds.length > 0) {
-        const path = drawVerticalLine(SWIMLANE_WIDTH * (circleIndex + 1), SWIMLANE_HEIGHT / 2, SWIMLANE_HEIGHT, circleColor);
-        svg.append(path);
-    }
-    if (historyItem.parentIds.length > 1) {
-        const circleOuter = drawCircle(circleIndex, CIRCLE_RADIUS + 1, circleColor);
-        svg.append(circleOuter);
-        const circleInner = drawCircle(circleIndex, CIRCLE_RADIUS - 1, circleColor);
-        svg.append(circleInner);
-    }
-    else {
-        if (historyItem.labels?.some(l => ThemeIcon.isThemeIcon(l.icon) && l.icon.id === 'target')) {
-            const outerCircle = drawCircle(circleIndex, CIRCLE_RADIUS + 2, circleColor);
-            svg.append(outerCircle);
-        }
-        const circle = drawCircle(circleIndex, CIRCLE_RADIUS, circleColor);
-        svg.append(circle);
-    }
-    svg.style.height = `${SWIMLANE_HEIGHT}px`;
-    svg.style.width = `${SWIMLANE_WIDTH * (Math.max(inputSwimlanes.length, outputSwimlanes.length, 1) + 1)}px`;
-    return svg;
-}
-function renderSCMHistoryGraphPlaceholder(columns) {
-    const elements = svgElem('svg', {
-        style: { height: `${SWIMLANE_HEIGHT}px`, width: `${SWIMLANE_WIDTH * (columns.length + 1)}px`, }
-    });
-    for (let index = 0; index < columns.length; index++) {
-        const path = drawVerticalLine(SWIMLANE_WIDTH * (index + 1), 0, SWIMLANE_HEIGHT, columns[index].color);
-        elements.root.append(path);
-    }
-    return elements.root;
-}
-function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( (new Map()))) {
-    let colorIndex = -1;
-    const viewModels = [];
-    for (let index = 0; index < historyItems.length; index++) {
-        const historyItem = historyItems[index];
-        const outputSwimlanesFromPreviousItem = lastOrDefault(viewModels)?.outputSwimlanes ?? [];
-        const inputSwimlanes = ( (outputSwimlanesFromPreviousItem.map(i => deepClone(i))));
-        const outputSwimlanes = [];
-        let firstParentAdded = false;
-        if (historyItem.parentIds.length > 0) {
-            for (const node of inputSwimlanes) {
-                if (node.id === historyItem.id) {
-                    if (!firstParentAdded) {
-                        outputSwimlanes.push({
-                            id: historyItem.parentIds[0],
-                            color: getLabelColorIdentifier(historyItem, colorMap) ?? node.color
-                        });
-                        firstParentAdded = true;
-                    }
-                    continue;
-                }
-                outputSwimlanes.push(deepClone(node));
-            }
-        }
-        for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
-            let colorIdentifier;
-            if (!firstParentAdded) {
-                colorIdentifier = getLabelColorIdentifier(historyItem, colorMap);
-            }
-            else {
-                const historyItemParent = historyItems
-                    .find(h => h.id === historyItem.parentIds[i]);
-                colorIdentifier = historyItemParent ? getLabelColorIdentifier(historyItemParent, colorMap) : undefined;
-            }
-            if (!colorIdentifier) {
-                colorIndex = rot(colorIndex + 1, colorRegistry.length);
-                colorIdentifier = colorRegistry[colorIndex];
-            }
-            outputSwimlanes.push({
-                id: historyItem.parentIds[i],
-                color: colorIdentifier
-            });
-        }
-        viewModels.push({
-            historyItem,
-            inputSwimlanes,
-            outputSwimlanes,
-        });
-    }
-    return viewModels;
-}
-
-export { SWIMLANE_HEIGHT, SWIMLANE_WIDTH, colorRegistry, historyItemGroupBase, historyItemGroupHoverLabelForeground, historyItemGroupLocal, historyItemGroupRemote, renderSCMHistoryGraphPlaceholder, renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray };