Merge pull request #73954 from jeanp413/debughover-preserve-whitespace

Preserve whitespace in debug hover expresion value
This commit is contained in:
Isidor Nikolic 2019-05-24 09:35:32 +02:00 committed by GitHub
commit 91d17baf10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 10 deletions

View file

@ -16,7 +16,7 @@ import { IContentWidget, ICodeEditor, IContentWidgetPosition, ContentWidgetPosit
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IDebugService, IExpression, IExpressionContainer } from 'vs/workbench/contrib/debug/common/debug';
import { Expression } from 'vs/workbench/contrib/debug/common/debugModel';
import { renderExpressionValue } from 'vs/workbench/contrib/debug/browser/baseDebugView';
import { renderExpressionValue, replaceWhitespace } from 'vs/workbench/contrib/debug/browser/baseDebugView';
import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
import { attachStylerCallback } from 'vs/platform/theme/common/styler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
@ -237,7 +237,7 @@ export class DebugHoverWidget implements IContentWidget {
this.complexValueContainer.hidden = false;
return this.tree.setInput(expression).then(() => {
this.complexValueTitle.textContent = expression.value;
this.complexValueTitle.textContent = replaceWhitespace(expression.value);
this.complexValueTitle.title = expression.value;
this.layoutTreeAndContainer();
this.editor.layoutContentWidget(this);

View file

@ -142,6 +142,7 @@
overflow: hidden;
text-overflow: ellipsis;
font-family: var(--monaco-monospace-font);
white-space: pre;
}
.monaco-workbench.mac .debug-viewlet .monaco-list-row .expression,

View file

@ -26,6 +26,7 @@
text-overflow: ellipsis;
height: 18px;
overflow: hidden;
white-space: pre;
border-bottom: 1px solid rgba(128, 128, 128, 0.35);
}
@ -60,10 +61,6 @@
max-height: 500px;
}
.monaco-editor .debug-hover-widget .monaco-tl-contents .value {
white-space: nowrap;
}
.monaco-editor .debug-hover-widget .error {
color: #E51400;
}

View file

@ -246,10 +246,6 @@
opacity: 0.35;
}
.monaco-workbench .debug-viewlet .monaco-list-row .expression {
white-space: pre;
}
.debug-viewlet .debug-call-stack .error {
font-style: italic;
text-overflow: ellipsis;