fix microsoft#57545

weinand · weinand · commit a550394f3488 · 2018-08-30T18:05:44.000+02:00
diff --git a/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts b/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
@@ -78,15 +78,24 @@ class BaseTreeItem {
 	// skips intermediate single-child nodes
 	getParent(): BaseTreeItem {
 		if (this._parent) {
-			const child = this._parent.oneChild();
-			if (child) {
+			if (this._parent.isSkipped()) {
 				return this._parent.getParent();
 			}
 			return this._parent;
 		}
 		return undefined;
 	}
 
+	isSkipped(): boolean {
+		if (this._parent) {
+			if (this._parent.oneChild()) {
+				return true;	// skipped if I'm the only child of my parents
+			}
+			return false;
+		}
+		return true;	// roots are never skipped
+	}
+
 	// skips intermediate single-child nodes
 	hasChildren(): boolean {
 		const child = this.oneChild();
@@ -119,10 +128,11 @@ class BaseTreeItem {
 	// skips intermediate single-child nodes
 	getHoverLabel(): string {
 		let label = this.getLabel(false);
-		if (this._parent) {
-			const parentLabel = this._parent.getHoverLabel();
-			if (parentLabel) {
-				return `${parentLabel}/${label}`;
+		const parent = this.getParent();
+		if (parent) {
+			const hover = parent.getHoverLabel();
+			if (hover) {
+				return `${hover}/${label}`;
 			}
 		}
 		return label;
