Skip to content

Commit

Permalink
microsoft#22622 - preliminary version
Browse files Browse the repository at this point in the history
  • Loading branch information
cristianhosu committed Mar 25, 2017
1 parent 15a85a4 commit 137f930
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion src/vs/workbench/parts/debug/browser/media/debugHover.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
word-break: normal;
text-overflow: ellipsis;
height: 18px;
overflow: hidden;
overflow: auto;
border-bottom: 1px solid rgba(128, 128, 128, 0.35);
}

Expand Down Expand Up @@ -67,6 +67,9 @@
.monaco-editor .debug-hover-widget .value {
white-space: pre-wrap;
color: rgba(108, 108, 108, 0.8);
overflow: auto;
max-height: 500px;
z-index: 60;
}

.monaco-editor .debug-hover-widget .error {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/parts/debug/electron-browser/debugHover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class DebugHoverWidget implements IContentWidget {
this.valueContainer.hidden = false;
renderExpressionValue(expression, this.valueContainer, {
showChanged: false,
maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_HOVER,
maxValueLength: null,
preserveWhitespace: true
});
this.valueContainer.title = '';
Expand Down Expand Up @@ -274,7 +274,7 @@ export class DebugHoverWidget implements IContentWidget {
if (visibleElementsCount === 0) {
this.doShow(this.showAtPosition, this.tree.getInput(), false, true);
} else {
const height = Math.min(visibleElementsCount, MAX_ELEMENTS_SHOWN) * 18;
const height = visibleElementsCount * 18; //Math.min(visibleElementsCount, MAX_ELEMENTS_SHOWN) * 18;

if (this.treeContainer.clientHeight !== height) {
this.treeContainer.style.height = `${height}px`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function renderExpressionValue(expressionOrValue: debug.IExpression | str
container.className = 'value changed';
}

if (options.maxValueLength && value.length > options.maxValueLength) {
if (options.maxValueLength && options.maxValueLength > 0 && value.length > options.maxValueLength) {
value = value.substr(0, options.maxValueLength) + '...';
}
if (value && !options.preserveWhitespace) {
Expand Down

0 comments on commit 137f930

Please sign in to comment.