@codingame/monaco-vscode-scm-service-override 6.0.2 → 7.0.0

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

@@ -0,0 +1,180 @@
+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';
+
+const SWIMLANE_HEIGHT = 22;
+const SWIMLANE_WIDTH = 11;
+const CIRCLE_RADIUS = 4;
+const SWIMLANE_CURVE_RADIUS = 5;
+const graphColors = ['#007ACC', '#BC3FBC', '#BF8803', '#CC6633', '#F14C4C', '#16825D'];
+function getNextColorIndex(colorIndex) {
+    return colorIndex < graphColors.length - 1 ? colorIndex + 1 : 1;
+}
+function getLabelColorIndex(historyItem, colorMap) {
+    for (const label of historyItem.labels ?? []) {
+        const colorIndex = colorMap.get(label.title);
+        if (colorIndex !== undefined) {
+            return colorIndex;
+        }
+    }
+    return undefined;
+}
+function createPath(stroke) {
+    const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+    path.setAttribute('fill', 'none');
+    path.setAttribute('stroke', stroke);
+    path.setAttribute('stroke-width', '1px');
+    path.setAttribute('stroke-linecap', 'round');
+    return path;
+}
+function drawCircle(index, radius, fill) {
+    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.setAttribute('fill', fill);
+    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 circleColorIndex = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color : inputSwimlanes[circleIndex].color;
+    let outputSwimlaneIndex = 0;
+    for (let index = 0; index < inputSwimlanes.length; index++) {
+        const color = graphColors[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(graphColors[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, graphColors[inputSwimlanes[inputIndex].color]);
+        svg.append(path);
+    }
+    if (historyItem.parentIds.length > 0) {
+        const path = drawVerticalLine(SWIMLANE_WIDTH * (circleIndex + 1), SWIMLANE_HEIGHT / 2, SWIMLANE_HEIGHT, graphColors[circleColorIndex]);
+        svg.append(path);
+    }
+    if (historyItem.parentIds.length > 1) {
+        const circleOuter = drawCircle(circleIndex, CIRCLE_RADIUS + 1, graphColors[circleColorIndex]);
+        svg.append(circleOuter);
+        const circleInner = drawCircle(circleIndex, CIRCLE_RADIUS - 1, graphColors[circleColorIndex]);
+        svg.append(circleInner);
+    }
+    else {
+        if (historyItem.labels?.some(l => ThemeIcon.isThemeIcon(l.icon) && l.icon.id === 'target')) {
+            const outerCircle = drawCircle(circleIndex, CIRCLE_RADIUS + 2, graphColors[circleColorIndex]);
+            svg.append(outerCircle);
+        }
+        const circle = drawCircle(circleIndex, CIRCLE_RADIUS, graphColors[circleColorIndex]);
+        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 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 = [];
+        if (historyItem.parentIds.length > 0) {
+            let firstParentAdded = false;
+            for (const node of inputSwimlanes) {
+                if (node.id === historyItem.id) {
+                    if (!firstParentAdded) {
+                        outputSwimlanes.push({
+                            id: historyItem.parentIds[0],
+                            color: getLabelColorIndex(historyItem, colorMap) ?? node.color
+                        });
+                        firstParentAdded = true;
+                    }
+                    continue;
+                }
+                outputSwimlanes.push(deepClone(node));
+            }
+            for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
+                colorIndex = getLabelColorIndex(historyItem, colorMap) ?? getNextColorIndex(colorIndex);
+                outputSwimlanes.push({
+                    id: historyItem.parentIds[i],
+                    color: colorIndex
+                });
+            }
+        }
+        viewModels.push({
+            historyItem,
+            inputSwimlanes,
+            outputSwimlanes,
+        });
+    }
+    return viewModels;
+}
+
+export { renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray };

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

@@ -1,13 +1,18 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { combinedDisposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { combinedDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/cancellation';
 import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
 import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
-import { isSCMRepository, StatusBarAction, connectPrimaryMenu } from './util.js';
+import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from './util.js';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { MenuItemAction, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -15,6 +20,8 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 var RepositoryRenderer_1;
 class RepositoryActionRunner extends ActionRunner {
@@ -35,13 +42,14 @@ let RepositoryRenderer = class RepositoryRenderer {
     static { RepositoryRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'repository'; }
     get templateId() { return RepositoryRenderer_1.TEMPLATE_ID; }
-    constructor(toolbarMenuId, actionViewItemProvider, scmViewService, commandService, contextKeyService, contextMenuService, keybindingService, menuService, telemetryService) {
+    constructor(toolbarMenuId, actionViewItemProvider, scmViewService, commandService, contextKeyService, contextMenuService, hoverService, keybindingService, menuService, telemetryService) {
         this.toolbarMenuId = toolbarMenuId;
         this.actionViewItemProvider = actionViewItemProvider;
         this.scmViewService = scmViewService;
         this.commandService = commandService;
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
+        this.hoverService = hoverService;
         this.keybindingService = keybindingService;
         this.menuService = menuService;
         this.telemetryService = telemetryService;
@@ -52,6 +60,7 @@ let RepositoryRenderer = class RepositoryRenderer {
         }
         const provider = append(container, $('.scm-provider'));
         const label = append(provider, $('.label'));
+        const labelCustomHover = this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), label, '', {});
         const name = append(label, $('span.name'));
         const description = append(label, $('span.description'));
         const actions = append(provider, $('.actions'));
@@ -68,18 +77,18 @@ let RepositoryRenderer = class RepositoryRenderer {
         const countContainer = append(provider, $('.count'));
         const count = ( new CountBadge(countContainer, {}, defaultCountBadgeStyles));
         const visibilityDisposable = toolBar.onDidChangeDropdownVisibility(e => provider.classList.toggle('active', e));
-        const templateDisposable = combinedDisposable(visibilityDisposable, toolBar);
-        return { label, name, description, countContainer, count, toolBar, elementDisposables: ( new DisposableStore()), templateDisposable };
+        const templateDisposable = combinedDisposable(labelCustomHover, visibilityDisposable, toolBar);
+        return { label, labelCustomHover, name, description, countContainer, count, toolBar, elementDisposables: ( new DisposableStore()), templateDisposable };
     }
     renderElement(arg, index, templateData, height) {
         const repository = isSCMRepository(arg) ? arg : arg.element;
         templateData.name.textContent = repository.provider.name;
         if (repository.provider.rootUri) {
-            templateData.label.title = `${repository.provider.label}: ${repository.provider.rootUri.fsPath}`;
+            templateData.labelCustomHover.update(`${repository.provider.label}: ${repository.provider.rootUri.fsPath}`);
             templateData.description.textContent = repository.provider.label;
         }
         else {
-            templateData.label.title = repository.provider.label;
+            templateData.labelCustomHover.update(repository.provider.label);
             templateData.description.textContent = '';
         }
         let statusPrimaryActions = [];
@@ -88,23 +97,16 @@ let RepositoryRenderer = class RepositoryRenderer {
         const updateToolbar = () => {
             templateData.toolBar.setActions([...statusPrimaryActions, ...menuPrimaryActions], menuSecondaryActions);
         };
-        const onDidChangeProvider = () => {
-            const commands = repository.provider.statusBarCommands || [];
+        templateData.elementDisposables.add(autorun(reader => {
+            const commands = repository.provider.statusBarCommands.read(reader) ?? [];
             statusPrimaryActions = ( commands.map(c => ( new StatusBarAction(c, this.commandService))));
             updateToolbar();
-            const count = repository.provider.count || 0;
+        }));
+        templateData.elementDisposables.add(autorun(reader => {
+            const count = repository.provider.count.read(reader) ?? getRepositoryResourceCount(repository.provider);
             templateData.countContainer.setAttribute('data-count', String(count));
             templateData.count.setCount(count);
-        };
-        let disposed = false;
-        templateData.elementDisposables.add(toDisposable(() => disposed = true));
-        templateData.elementDisposables.add(repository.provider.onDidChange(() => {
-            if (disposed) {
-                return;
-            }
-            onDidChangeProvider();
         }));
-        onDidChangeProvider();
         const repositoryMenus = this.scmViewService.menus.getRepositoryMenus(repository.provider);
         const menu = this.toolbarMenuId === MenuId.SCMTitle ? repositoryMenus.titleMenu.menu : repositoryMenus.repositoryMenu;
         templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
@@ -130,9 +132,10 @@ RepositoryRenderer = RepositoryRenderer_1 = ( __decorate([
     ( __param(3, ICommandService)),
     ( __param(4, IContextKeyService)),
     ( __param(5, IContextMenuService)),
-    ( __param(6, IKeybindingService)),
-    ( __param(7, IMenuService)),
-    ( __param(8, ITelemetryService))
+    ( __param(6, IHoverService)),
+    ( __param(7, IKeybindingService)),
+    ( __param(8, IMenuService)),
+    ( __param(9, ITelemetryService))
 ], RepositoryRenderer));
 
 export { RepositoryActionRunner, RepositoryRenderer };