From 4222b6cd24bbdb5597eb596d56c44c4fae79fdaf Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Tue, 22 Jun 2021 00:31:54 -0400
Subject: [PATCH] Re-adds debugging info to resolved nodes

---
 src/views/viewBase.ts | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/views/viewBase.ts b/src/views/viewBase.ts
index 596db1f..fdd809b 100644
--- a/src/views/viewBase.ts
+++ b/src/views/viewBase.ts
@@ -109,13 +109,7 @@ export abstract class ViewBase<
 
 	constructor(public readonly id: string, public readonly name: string) {
 		if (Logger.isDebugging || Container.config.debug) {
-			const getTreeItem = this.getTreeItem;
-			this.getTreeItem = async function (this: ViewBase<RootNode, ViewConfig>, node: ViewNode) {
-				const item = await getTreeItem.apply(this, [node]);
-				if (node.resolveTreeItem != null) return item;
-
-				const parent = node.getParent();
-
+			function addDebuggingInfo(item: TreeItem, node: ViewNode, parent: ViewNode | undefined) {
 				if (item.tooltip == null) {
 					item.tooltip = new MarkdownString(
 						item.label != null && typeof item.label !== 'string' ? item.label.label : item.label ?? '',
@@ -133,6 +127,28 @@ export abstract class ViewBase<
 						}`,
 					);
 				}
+			}
+
+			const getTreeItem = this.getTreeItem;
+			this.getTreeItem = async function (this: ViewBase<RootNode, ViewConfig>, node: ViewNode) {
+				const item = await getTreeItem.apply(this, [node]);
+
+				const parent = node.getParent();
+
+				if (node.resolveTreeItem != null) {
+					const resolveTreeItem = node.resolveTreeItem;
+					node.resolveTreeItem = async function (this: ViewBase<RootNode, ViewConfig>, item: TreeItem) {
+						const resolvedItem = await resolveTreeItem.apply(this, [item]);
+
+						addDebuggingInfo(resolvedItem, node, parent);
+
+						return resolvedItem;
+					};
+
+					return item;
+				}
+
+				addDebuggingInfo(item, node, parent);
 
 				return item;
 			};