From ec0195d126d6169e8260268e5c99b951945afef3 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 5 Oct 2020 11:54:28 +0200 Subject: [PATCH] fix https://github.com/microsoft/vscode/issues/99370 --- .../editor/contrib/suggest/media/suggest.css | 6 +++-- .../contrib/suggest/suggestWidgetDetails.ts | 24 +++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/vs/editor/contrib/suggest/media/suggest.css b/src/vs/editor/contrib/suggest/media/suggest.css index f27c197aa2d..4908df1a1d7 100644 --- a/src/vs/editor/contrib/suggest/media/suggest.css +++ b/src/vs/editor/contrib/suggest/media/suggest.css @@ -213,7 +213,9 @@ /** signature, qualifier, type/details opacity **/ -.monaco-editor .suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left>.signature-label, .monaco-editor .suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left>.qualifier-label, .monaco-editor .suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right>.details-label { +.monaco-editor .suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left>.signature-label, +.monaco-editor .suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left>.qualifier-label, +.monaco-editor .suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right>.details-label { opacity: 0.7; } @@ -411,7 +413,7 @@ overflow: hidden; text-overflow: ellipsis; opacity: 0.7; - word-break: break-all; + white-space: nowrap; margin: 0 24px 0 0; padding: 4px 0 12px 5px; } diff --git a/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts b/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts index 8e08db852b0..d170854aeb6 100644 --- a/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts +++ b/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts @@ -5,7 +5,7 @@ import * as nls from 'vs/nls'; import { IDisposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle'; -import { append, $, hide, show } from 'vs/base/browser/dom'; +import * as dom from 'vs/base/browser/dom'; import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; @@ -43,21 +43,21 @@ export class SuggestionDetails { private readonly _markdownRenderer: MarkdownRenderer, private readonly _kbToggleDetails: string ) { - this.element = append(container, $('.details')); + this.element = dom.append(container, dom.$('.details')); this._disposables.add(toDisposable(() => this.element.remove())); - this._body = $('.body'); + this._body = dom.$('.body'); this._scrollbar = new DomScrollableElement(this._body, {}); - append(this.element, this._scrollbar.getDomNode()); + dom.append(this.element, this._scrollbar.getDomNode()); this._disposables.add(this._scrollbar); - this._header = append(this._body, $('.header')); - this._close = append(this._header, $('span' + Codicon.close.cssSelector)); + this._header = dom.append(this._body, dom.$('.header')); + this._close = dom.append(this._header, dom.$('span' + Codicon.close.cssSelector)); this._close.title = nls.localize('readLess', "Read Less ({0})", this._kbToggleDetails); - this._type = append(this._header, $('p.type')); + this._type = dom.append(this._header, dom.$('p.type')); - this._docs = append(this._body, $('p.docs')); + this._docs = dom.append(this._body, dom.$('p.docs')); this._configureFont(); @@ -134,11 +134,11 @@ export class SuggestionDetails { // --- details if (detail) { - this._type.innerText = detail.length > 100000 ? `${detail.substr(0, 100000)}…` : detail; - show(this._type); + this._type.textContent = detail.length > 100000 ? `${detail.substr(0, 100000)}…` : detail; + dom.show(this._type); } else { - this._type.innerText = ''; - hide(this._type); + dom.clearNode(this._type); + dom.hide(this._type); } this.element.style.height = this._header.offsetHeight + this._docs.offsetHeight + (this._borderWidth * 2) + 'px'; -- GitLab