From e1084ca2d2c77a72201c41516163c0ae83b99fbf Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 28 Nov 2016 16:01:45 +0100 Subject: [PATCH] Debug console do not show tooltip fixes #16105 --- .../parts/debug/electron-browser/debugViewer.ts | 12 ++++++++---- .../parts/debug/electron-browser/replViewer.ts | 9 ++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts index 00b673c8cd9..f531734cb4b 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts @@ -41,6 +41,7 @@ export interface IRenderValueOptions { preserveWhitespace?: boolean; showChanged?: boolean; maxValueLength?: number; + showHover?: boolean; } export function renderExpressionValue(expressionOrValue: debug.IExpression | string, container: HTMLElement, options: IRenderValueOptions): void { @@ -75,7 +76,9 @@ export function renderExpressionValue(expressionOrValue: debug.IExpression | str } else { container.textContent = value; } - container.title = value; + if (options.showHover) { + container.title = value; + } } export function renderVariable(tree: ITree, variable: Variable, data: IVariableTemplateData, showChanged: boolean): void { @@ -89,9 +92,9 @@ export function renderVariable(tree: ITree, variable: Variable, data: IVariableT renderExpressionValue(variable, data.value, { showChanged, maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET, - preserveWhitespace: false + preserveWhitespace: false, + showHover: true }); - data.value.title = variable.value; } else { data.value.textContent = ''; data.value.title = ''; @@ -958,7 +961,8 @@ export class WatchExpressionsRenderer implements IRenderer { renderExpressionValue(watchExpression, data.value, { showChanged: true, maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET, - preserveWhitespace: false + preserveWhitespace: false, + showHover: true }); data.name.title = watchExpression.type ? watchExpression.type : watchExpression.value; } diff --git a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts index ed7ab537ecf..e432d3a798d 100644 --- a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts +++ b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts @@ -220,7 +220,8 @@ export class ReplExpressionsRenderer implements IRenderer { private renderExpression(tree: ITree, expression: IExpression, templateData: IExpressionTemplateData): void { templateData.input.textContent = expression.name; renderExpressionValue(expression, templateData.value, { - preserveWhitespace: true + preserveWhitespace: true, + showHover: false }); if (expression.hasChildren) { templateData.annotation.className = 'annotation octicon octicon-info'; @@ -244,7 +245,8 @@ export class ReplExpressionsRenderer implements IRenderer { let result = this.handleANSIOutput(output.value); if (typeof result === 'string') { renderExpressionValue(result, templateData.value, { - preserveWhitespace: true + preserveWhitespace: true, + showHover: false }); } else { templateData.value.appendChild(result); @@ -263,7 +265,8 @@ export class ReplExpressionsRenderer implements IRenderer { // value renderExpressionValue(output.value, templateData.value, { - preserveWhitespace: true + preserveWhitespace: true, + showHover: false }); // annotation if any -- GitLab