fixes microsoft#106865

isidorn · isidorn · commit 3156f1fbfcbb · 2020-09-17T18:44:08.000+02:00
diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -34,7 +34,6 @@ import { EvaluatableExpressionProviderRegistry } from 'vs/editor/common/modes';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
 const $ = dom.$;
-const MAX_TREE_HEIGHT = 324;
 
 async function doFindExpression(container: IExpressionContainer, namesToFind: string[]): Promise<IExpression | null> {
 	if (!container) {
@@ -140,7 +139,7 @@ export class DebugHoverWidget implements IContentWidget {
 				this.domNode.style.color = '';
 			}
 		}));
-		this.toDispose.push(this.tree.onDidChangeContentHeight(() => this.layoutTreeAndContainer()));
+		this.toDispose.push(this.tree.onDidChangeContentHeight(() => this.layoutTreeAndContainer(false)));
 
 		this.registerListeners();
 		this.editor.addContentWidget(this);
@@ -285,7 +284,7 @@ export class DebugHoverWidget implements IContentWidget {
 		await this.tree.setInput(expression);
 		this.complexValueTitle.textContent = expression.value;
 		this.complexValueTitle.title = expression.value;
-		this.layoutTreeAndContainer();
+		this.layoutTreeAndContainer(true);
 		this.editor.layoutContentWidget(this);
 		this.scrollbar.scanDomNode();
 		this.tree.scrollTop = 0;
@@ -298,11 +297,11 @@ export class DebugHoverWidget implements IContentWidget {
 		}
 	}
 
-	private layoutTreeAndContainer(): void {
+	private layoutTreeAndContainer(initialLayout: boolean): void {
 		const scrollBarHeight = 8;
-		const treeHeight = Math.min(MAX_TREE_HEIGHT, this.tree.contentHeight + scrollBarHeight);
+		const treeHeight = Math.min(this.editor.getScrollHeight() / 2, this.tree.contentHeight + scrollBarHeight);
 		this.treeContainer.style.height = `${treeHeight}px`;
-		this.tree.layout(treeHeight, 324);
+		this.tree.layout(treeHeight, initialLayout ? 400 : undefined);
 	}
 
 	hide(): void {
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugHover.css b/src/vs/workbench/contrib/debug/browser/media/debugHover.css
@@ -16,7 +16,7 @@
 }
 
 .monaco-editor .debug-hover-widget .complex-value {
-	width: 324px;
+	max-width: 700px;
 }
 
 .monaco-editor .debug-hover-widget .complex-value .title {
@@ -57,12 +57,13 @@
 	background-color: rgba(173, 214, 255, 0.15);
 }
 
-.monaco-editor .debug-hover-widget .value {
+.monaco-editor .debug-hover-widget > .monaco-scrollable-element > .value {
 	color: rgba(108, 108, 108, 0.8);
 	overflow: auto;
 	font-family: var(--monaco-monospace-font);
 	max-height: 500px;
 	padding: 4px 5px;
+	white-space: pre-wrap;
 }
 
 .monaco-editor.vs-dark .debugHoverHighlight,

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`.monaco-editor .debug-hover-widget .complex-value {`
`19`		`- width: 324px;`
	`19`	`+ max-width: 700px;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`.monaco-editor .debug-hover-widget .complex-value .title {`
`@@ -57,12 +57,13 @@`
`57`	`57`	`background-color: rgba(173, 214, 255, 0.15);`
`58`	`58`	`}`
`59`	`59`
`60`		`-.monaco-editor .debug-hover-widget .value {`
	`60`	`+.monaco-editor .debug-hover-widget > .monaco-scrollable-element > .value {`
`61`	`61`	`color: rgba(108, 108, 108, 0.8);`
`62`	`62`	`overflow: auto;`
`63`	`63`	`font-family: var(--monaco-monospace-font);`
`64`	`64`	`max-height: 500px;`
`65`	`65`	`padding: 4px 5px;`
	`66`	`+ white-space: pre-wrap;`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`.monaco-editor.vs-dark .debugHoverHighlight,`