diff --git a/src/vs/base/browser/ui/hover/baseHoverWidget.ts b/src/vs/base/browser/ui/hover/baseHoverWidget.ts index 35490d254e8..beb1ed53144 100644 --- a/src/vs/base/browser/ui/hover/baseHoverWidget.ts +++ b/src/vs/base/browser/ui/hover/baseHoverWidget.ts @@ -13,7 +13,7 @@ const $ = dom.$; export class HoverWidget extends Disposable { public readonly containerDomNode: HTMLElement; - public readonly domNode: HTMLElement; + public readonly contentsDomNode: HTMLElement; private readonly _scrollbar: DomScrollableElement; constructor() { @@ -24,14 +24,14 @@ export class HoverWidget extends Disposable { this.containerDomNode.tabIndex = 0; this.containerDomNode.setAttribute('role', 'tooltip'); - this.domNode = document.createElement('div'); - this.domNode.className = 'monaco-editor-hover-content'; + this.contentsDomNode = document.createElement('div'); + this.contentsDomNode.className = 'monaco-editor-hover-content'; - this._scrollbar = this._register(new DomScrollableElement(this.domNode, {})); + this._scrollbar = this._register(new DomScrollableElement(this.contentsDomNode, {})); this.containerDomNode.appendChild(this._scrollbar.getDomNode()); } - public onContentsChange(): void { + public onContentsChanged(): void { this._scrollbar.scanDomNode(); } } diff --git a/src/vs/editor/contrib/hover/hoverWidgets.ts b/src/vs/editor/contrib/hover/hoverWidgets.ts index 03918fab706..88a6997df32 100644 --- a/src/vs/editor/contrib/hover/hoverWidgets.ts +++ b/src/vs/editor/contrib/hover/hoverWidgets.ts @@ -128,17 +128,17 @@ export class ContentHoverWidget extends Widget implements IContentWidget { } private updateFont(): void { - const codeClasses: HTMLElement[] = Array.prototype.slice.call(this._hover.domNode.getElementsByClassName('code')); + const codeClasses: HTMLElement[] = Array.prototype.slice.call(this._hover.contentsDomNode.getElementsByClassName('code')); codeClasses.forEach(node => this._editor.applyFontInfo(node)); } protected updateContents(node: Node): void { - this._hover.domNode.textContent = ''; - this._hover.domNode.appendChild(node); + this._hover.contentsDomNode.textContent = ''; + this._hover.contentsDomNode.appendChild(node); this.updateFont(); this._editor.layoutContentWidget(this); - this._hover.onContentsChange(); + this._hover.onContentsChanged(); } protected _renderAction(parent: HTMLElement, actionOptions: { label: string, iconClass?: string, run: (target: HTMLElement) => void, commandId: string }): IDisposable { @@ -151,10 +151,10 @@ export class ContentHoverWidget extends Widget implements IContentWidget { const height = Math.max(this._editor.getLayoutInfo().height / 4, 250); const { fontSize, lineHeight } = this._editor.getOption(EditorOption.fontInfo); - this._hover.domNode.style.fontSize = `${fontSize}px`; - this._hover.domNode.style.lineHeight = `${lineHeight}px`; - this._hover.domNode.style.maxHeight = `${height}px`; - this._hover.domNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`; + this._hover.contentsDomNode.style.fontSize = `${fontSize}px`; + this._hover.contentsDomNode.style.lineHeight = `${lineHeight}px`; + this._hover.contentsDomNode.style.maxHeight = `${height}px`; + this._hover.contentsDomNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`; } } diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts index 774d5cbd3d2..5996e9c11c8 100644 --- a/src/vs/editor/contrib/hover/modesContentHover.ts +++ b/src/vs/editor/contrib/hover/modesContentHover.ts @@ -249,7 +249,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget { })); this._register(TokenizationRegistry.onDidChange((e) => { if (this.isVisible && this._lastRange && this._messages.length > 0) { - this._hover.domNode.textContent = ''; + this._hover.contentsDomNode.textContent = ''; this._renderMessages(this._lastRange, this._messages); } })); @@ -461,7 +461,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget { const renderer = markdownDisposeables.add(new MarkdownRenderer(this._editor, this._modeService, this._openerService)); markdownDisposeables.add(renderer.onDidRenderCodeBlock(() => { hoverContentsElement.className = 'hover-contents code-hover-contents'; - this._hover.onContentsChange(); + this._hover.onContentsChanged(); })); const renderedContents = markdownDisposeables.add(renderer.render(contents)); hoverContentsElement.appendChild(renderedContents.element); diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts b/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts index d49723735a5..c7127c4e465 100644 --- a/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts +++ b/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts @@ -76,7 +76,7 @@ export class HoverWidget extends Widget { }); contentsElement.appendChild(markdownElement); rowElement.appendChild(contentsElement); - this._hover.domNode.appendChild(rowElement); + this._hover.contentsDomNode.appendChild(rowElement); if (this._actions && this._actions.length > 0) { const statusBarElement = $('div.hover-row.status-bar'); @@ -103,7 +103,7 @@ export class HoverWidget extends Widget { const anchor = this._target.anchor; this._hover.containerDomNode.classList.remove('right-aligned'); - this._hover.domNode.style.maxHeight = ''; + this._hover.contentsDomNode.style.maxHeight = ''; if (anchor.horizontalAnchorSide === HorizontalAnchorSide.Left) { if (anchor.x + this._hover.containerDomNode.clientWidth > document.documentElement.clientWidth) { // Shift the hover to the left when part of it would get cut off @@ -128,7 +128,7 @@ export class HoverWidget extends Widget { if (anchor.verticalAnchorSide === VerticalAnchorSide.Bottom) { if (anchor.y + this._hover.containerDomNode.clientHeight > document.documentElement.clientHeight) { this._hover.containerDomNode.style.top = `${anchor.fallbackY}px`; - this._hover.domNode.style.maxHeight = `${document.documentElement.clientHeight - anchor.fallbackY}px`; + this._hover.contentsDomNode.style.maxHeight = `${document.documentElement.clientHeight - anchor.fallbackY}px`; } else { this._hover.containerDomNode.style.bottom = `${anchor.y}px`; this._hover.containerDomNode.style.maxHeight = ''; @@ -140,7 +140,7 @@ export class HoverWidget extends Widget { this._hover.containerDomNode.style.top = `${anchor.y}px`; } } - this._hover.onContentsChange(); + this._hover.onContentsChanged(); } public focus() {