improve DI graph (#159849)

microsoft · Sep 2, 2022 · 001eb8b · 001eb8b
1 parent b766391
commit 001eb8b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/vs/platform/instantiation/common/graph.ts b/src/vs/platform/instantiation/common/graph.ts
@@ -5,13 +5,14 @@
 
 export class Node<T> {
 
-	readonly data: T;
+
 	readonly incoming = new Map<string, Node<T>>();
 	readonly outgoing = new Map<string, Node<T>>();
 
-	constructor(data: T) {
-		this.data = data;
-	}
+	constructor(
+		readonly key: string,
+		readonly data: T
+	) { }
 }
 
 export class Graph<T> {
@@ -36,8 +37,8 @@ export class Graph<T> {
 		const fromNode = this.lookupOrInsertNode(from);
 		const toNode = this.lookupOrInsertNode(to);
 
-		fromNode.outgoing.set(this._hashFn(to), toNode);
-		toNode.incoming.set(this._hashFn(from), fromNode);
+		fromNode.outgoing.set(toNode.key, toNode);
+		toNode.incoming.set(fromNode.key, fromNode);
 	}
 
 	removeNode(data: T): void {
@@ -54,7 +55,7 @@ export class Graph<T> {
 		let node = this._nodes.get(key);
 
 		if (!node) {
-			node = new Node(data);
+			node = new Node(key, data);
 			this._nodes.set(key, node);
 		}
 
@@ -72,7 +73,7 @@ export class Graph<T> {
 	toString(): string {
 		const data: string[] = [];
 		for (const [key, value] of this._nodes) {
-			data.push(`${key}, (incoming)[${[...value.incoming.keys()].join(', ')}], (outgoing)[${[...value.outgoing.keys()].join(',')}]`);
+			data.push(`${key}\n\t(-> incoming)[${[...value.incoming.keys()].join(', ')}]\n\t(outgoing ->)[${[...value.outgoing.keys()].join(',')}]\n`);
 
 		}
 		return data.join('\n');