SCM - use correct color when rendering merge commit (microsoft#223613)

Author: lszomoru

src/vs/workbench/contrib/scm/browser/scmHistory.ts

@@ -261,7 +261,16 @@ export function toISCMHistoryItemViewModelArray(historyItems: ISCMHistoryItem[],
 			// Add unprocessed parent(s) to the output
 			for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
 				// Color index (label -> next color)
-				let colorIdentifier = getLabelColorIdentifier(historyItem, colorMap);
+				let colorIdentifier: string | undefined;
+
+				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];

src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts

@@ -5,7 +5,8 @@
 
 import * as assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
-import { colorRegistry, toISCMHistoryItemViewModelArray } from 'vs/workbench/contrib/scm/browser/scmHistory';
+import { ColorIdentifier } from 'vs/platform/theme/common/colorUtils';
+import { colorRegistry, historyItemGroupBase, historyItemGroupLocal, historyItemGroupRemote, toISCMHistoryItemViewModelArray } from 'vs/workbench/contrib/scm/browser/scmHistory';
 import { ISCMHistoryItem } from 'vs/workbench/contrib/scm/common/history';
 
 suite('toISCMHistoryItemViewModelArray', () => {
@@ -500,4 +501,92 @@ suite('toISCMHistoryItemViewModelArray', () => {
 		assert.strictEqual(viewModels[6].outputSwimlanes[0].id, 'h');
 		assert.strictEqual(viewModels[6].outputSwimlanes[0].color, colorRegistry[0]);
 	});
+
+	/**
+	 * 	* a(b) [topic]
+	 * 	* b(c)
+	 * 	* c(d) [origin/topic]
+	 * 	* d(e)
+	 * 	* e(f,g)
+	 * 	|\
+	 * 	| * g(h) [origin/main]
+	 */
+	test('graph with color map', () => {
+		const models = [
+			{ id: 'a', parentIds: ['b'], labels: [{ title: 'topic' }] },
+			{ id: 'b', parentIds: ['c'] },
+			{ id: 'c', parentIds: ['d'], labels: [{ title: 'origin/topic' }] },
+			{ id: 'd', parentIds: ['e'] },
+			{ id: 'e', parentIds: ['f', 'g'] },
+			{ id: 'g', parentIds: ['h'], labels: [{ title: 'origin/main' }] }
+		] as ISCMHistoryItem[];
+
+		const colorMap = new Map<string, ColorIdentifier>([
+			['topic', historyItemGroupLocal],
+			['origin/topic', historyItemGroupRemote],
+			['origin/main', historyItemGroupBase],
+		]);
+
+		const viewModels = toISCMHistoryItemViewModelArray(models, colorMap);
+
+		assert.strictEqual(viewModels.length, 6);
+
+		// node a
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, historyItemGroupLocal);
+
+		// node b
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, historyItemGroupLocal);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, historyItemGroupLocal);
+
+		// node c
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, historyItemGroupLocal);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, historyItemGroupRemote);
+
+		// node d
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'd');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, historyItemGroupRemote);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, historyItemGroupRemote);
+
+		// node e
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, historyItemGroupRemote);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, historyItemGroupRemote);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].color, historyItemGroupBase);
+
+		// node g
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, historyItemGroupRemote);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].id, 'g');
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].color, historyItemGroupBase);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, historyItemGroupRemote);
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].id, 'h');
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].color, historyItemGroupBase);
+	});
 });