@codingame/monaco-vscode-scm-service-override 7.1.0 → 8.0.0

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

@@ -1,16 +1,34 @@
+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';
 
 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) {
+const historyItemGroupLocal = registerColor('scm.historyGraph.historyItemGroupLocal', chartsBlue, ( localize(10413, "Local history item group color.")));
+const historyItemGroupRemote = registerColor('scm.historyGraph.historyItemGroupRemote', chartsPurple, ( localize(10414, "Remote history item group color.")));
+const historyItemGroupBase = registerColor('scm.historyGraph.historyItemGroupBase', chartsOrange, ( localize(10415, "Base history item group color.")));
+const historyItemGroupHoverLabelForeground = registerColor('scm.historyGraph.historyItemGroupHoverLabelForeground', buttonForeground, ( localize(10416, "History item group hover label foreground color.")));
+const colorRegistry = [
+    registerColor('scm.historyGraph.green', chartsGreen, ( localize(10417, "The green color used in history graph."))),
+    registerColor('scm.historyGraph.red', chartsRed, ( localize(10418, "The red color used in history graph."))),
+    registerColor('scm.historyGraph.yellow', chartsYellow, ( localize(10419, "The yellow color used in history graph."))),
+];
+function getLabelColorIdentifier(historyItem, colorMap) {
     for (const label of historyItem.labels ?? []) {
         const colorIndex = colorMap.get(label.title);
         if (colorIndex !== undefined) {
@@ -19,20 +37,20 @@ function getLabelColorIndex(historyItem, colorMap) {
     }
     return undefined;
 }
-function createPath(stroke) {
+function createPath(colorIdentifier) {
     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');
+    path.style.stroke = asCssVariable(colorIdentifier);
     return path;
 }
-function drawCircle(index, radius, fill) {
+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.setAttribute('fill', fill);
+    circle.style.fill = asCssVariable(colorIdentifier);
     return circle;
 }
 function drawVerticalLine(x1, y1, y2, color) {
@@ -56,10 +74,10 @@ function renderSCMHistoryItemGraph(historyItemViewModel) {
     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;
+    const circleColor = 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];
+        const color = inputSwimlanes[index].color;
         if (inputSwimlanes[index].id === historyItem.id) {
             if (index !== circleIndex) {
                 const d = [];
@@ -103,7 +121,7 @@ function renderSCMHistoryItemGraph(historyItemViewModel) {
             continue;
         }
         const d = [];
-        const path = createPath(graphColors[outputSwimlanes[parentOutputIndex].color]);
+        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}`);
@@ -112,38 +130,38 @@ function renderSCMHistoryItemGraph(historyItemViewModel) {
         svg.append(path);
     }
     if (inputIndex !== -1) {
-        const path = drawVerticalLine(SWIMLANE_WIDTH * (circleIndex + 1), 0, SWIMLANE_HEIGHT / 2, graphColors[inputSwimlanes[inputIndex].color]);
+        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, graphColors[circleColorIndex]);
+        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, graphColors[circleColorIndex]);
+        const circleOuter = drawCircle(circleIndex, CIRCLE_RADIUS + 1, circleColor);
         svg.append(circleOuter);
-        const circleInner = drawCircle(circleIndex, CIRCLE_RADIUS - 1, graphColors[circleColorIndex]);
+        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, graphColors[circleColorIndex]);
+            const outerCircle = drawCircle(circleIndex, CIRCLE_RADIUS + 2, circleColor);
             svg.append(outerCircle);
         }
-        const circle = drawCircle(circleIndex, CIRCLE_RADIUS, graphColors[circleColorIndex]);
+        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 toISCMHistoryItemViewModelArray(historyItems, colorMap = ( new Map())) {
+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 inputSwimlanes = ( (outputSwimlanesFromPreviousItem.map(i => deepClone(i))));
         const outputSwimlanes = [];
         if (historyItem.parentIds.length > 0) {
             let firstParentAdded = false;
@@ -152,7 +170,7 @@ function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( new Map()))
                     if (!firstParentAdded) {
                         outputSwimlanes.push({
                             id: historyItem.parentIds[0],
-                            color: getLabelColorIndex(historyItem, colorMap) ?? node.color
+                            color: getLabelColorIdentifier(historyItem, colorMap) ?? node.color
                         });
                         firstParentAdded = true;
                     }
@@ -161,10 +179,22 @@ function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( new Map()))
                 outputSwimlanes.push(deepClone(node));
             }
             for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
-                colorIndex = getLabelColorIndex(historyItem, colorMap) ?? getNextColorIndex(colorIndex);
+                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: colorIndex
+                    color: colorIdentifier
                 });
             }
         }
@@ -177,4 +207,4 @@ function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( new Map()))
     return viewModels;
 }
 
-export { renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray };
+export { colorRegistry, historyItemGroupBase, historyItemGroupHoverLabelForeground, historyItemGroupLocal, historyItemGroupRemote, renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray };

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
@@ -13,7 +13,6 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
@@ -24,7 +23,6 @@ import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
-const _moduleId = "vs/workbench/contrib/scm/browser/scmRepositoriesViewPane";
 class ListDelegate {
     getHeight() {
         return 22;
@@ -55,15 +53,13 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         this.list = this.instantiationService.createInstance(WorkbenchList, `SCM Main`, listContainer, delegate, [renderer], {
             identityProvider,
             horizontalScrolling: false,
-            overrideStyles: {
-                listBackground: SIDE_BAR_BACKGROUND
-            },
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             accessibilityProvider: {
                 getAriaLabel(r) {
                     return r.provider.label;
                 },
                 getWidgetAriaLabel() {
-                    return ( localizeWithPath(_moduleId, 0, "Source Control Repositories"));
+                    return ( localize(6366, "Source Control Repositories"));
                 }
             }
         });