cleaning the code

Author: aiday-mar

src/vs/editor/contrib/hover/browser/contentHover.ts

@@ -480,12 +480,12 @@ export class ContentHoverWidget extends ResizableContentWidget {
 	}
 
 	constructor(
-		_editor: ICodeEditor,
-		@IContextKeyService _contextKeyService: IContextKeyService
+		editor: ICodeEditor,
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
-		super(_editor);
-		this._hoverVisibleKey = EditorContextKeys.hoverVisible.bindTo(_contextKeyService);
-		this._hoverFocusedKey = EditorContextKeys.hoverFocused.bindTo(_contextKeyService);
+		super(editor);
+		this._hoverVisibleKey = EditorContextKeys.hoverVisible.bindTo(contextKeyService);
+		this._hoverFocusedKey = EditorContextKeys.hoverFocused.bindTo(contextKeyService);
 
 		dom.append(this._resizableNode.domNode, this._hover.containerDomNode);
 		this._resizableNode.domNode.style.zIndex = '50';
@@ -518,30 +518,30 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		return ContentHoverWidget.ID;
 	}
 
-	private _setDimensions(container: HTMLElement, width: number | string, height: number | string) {
+	private static _applyDimensions(container: HTMLElement, width: number | string, height: number | string): void {
 		const transformedWidth = typeof width === 'number' ? `${width}px` : width;
 		const transformedHeight = typeof height === 'number' ? `${height}px` : height;
 		container.style.width = transformedWidth;
 		container.style.height = transformedHeight;
 	}
 
-	private _setContentsDomNodeDimensions(width: number | string, height: number | string) {
+	private _setContentsDomNodeDimensions(width: number | string, height: number | string): void {
 		const contentsDomNode = this._hover.contentsDomNode;
-		return this._setDimensions(contentsDomNode, width, height);
+		return ContentHoverWidget._applyDimensions(contentsDomNode, width, height);
 	}
 
-	private _setContainerDomNodeDimensions(width: number | string, height: number | string) {
+	private _setContainerDomNodeDimensions(width: number | string, height: number | string): void {
 		const containerDomNode = this._hover.containerDomNode;
-		return this._setDimensions(containerDomNode, width, height);
+		return ContentHoverWidget._applyDimensions(containerDomNode, width, height);
 	}
 
-	private _setHoverWidgetDimensions(width: number | string, height: number | string) {
+	private _setHoverWidgetDimensions(width: number | string, height: number | string): void {
 		this._setContentsDomNodeDimensions(width, height);
 		this._setContainerDomNodeDimensions(width, height);
 		this._layoutContentWidget();
 	}
 
-	private _setContentsDomNodeMaxDimensions(width: number | string, height: number | string) {
+	private _setContentsDomNodeMaxDimensions(width: number | string, height: number | string): void {
 		const transformedWidth = typeof width === 'number' ? `${width}px` : width;
 		const transformedHeight = typeof height === 'number' ? `${height}px` : height;
 		const contentsDomNode = this._hover.contentsDomNode;
@@ -555,7 +555,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		return hasHorizontalScrollbar;
 	}
 
-	private _adjustContentsBottomPadding() {
+	private _adjustContentsBottomPadding(): void {
 		const contentsDomNode = this._hover.contentsDomNode;
 		const extraBottomPadding = `${this._hover.scrollbar.options.horizontalScrollbarSize}px`;
 		if (contentsDomNode.style.paddingBottom !== extraBottomPadding) {
@@ -575,13 +575,13 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		}
 	}
 
-	private _setResizableNodeMaxDimensions() {
+	private _setResizableNodeMaxDimensions(): void {
 		const maxRenderingWidth = this._findMaximumRenderingWidth() ?? Infinity;
 		const maxRenderingHeight = this._findMaximumRenderingHeight() ?? Infinity;
 		this._resizableNode.maxSize = new dom.Dimension(maxRenderingWidth, maxRenderingHeight);
 	}
 
-	override _resize(size: dom.Dimension) {
+	override _resize(size: dom.Dimension): void {
 		this._setAdjustedHoverWidgetDimensions(size);
 		this._resizableNode.layout(size.height, size.width);
 		this._setResizableNodeMaxDimensions();

src/vs/editor/contrib/hover/browser/hover.ts

@@ -32,7 +32,7 @@ import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
 import * as nls from 'vs/nls';
 import 'vs/css!./hover';
 
-// sticky suggest widget which doesn't disappear on focus out and such
+// sticky hover widget which doesn't disappear on focus out and such
 const _sticky = false
 	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
 	;

src/vs/editor/contrib/hover/browser/resizableContentWidget.ts

@@ -7,13 +7,11 @@ import { ResizableHTMLElement } from 'vs/base/browser/ui/resizable/resizable';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { clamp } from 'vs/base/common/numbers';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import * as dom from 'vs/base/browser/dom';
 
 const TOP_HEIGHT = 30;
 const BOTTOM_HEIGHT = 24;
-const MIN_HEIGHT = 24;
 
 export abstract class ResizableContentWidget extends Disposable implements IContentWidget {
 
@@ -27,13 +25,13 @@ export abstract class ResizableContentWidget extends Disposable implements ICont
 
 	constructor(
 		protected readonly _editor: ICodeEditor,
-		_initialSize: dom.IDimension = new dom.Dimension(10, 10)
+		initialSize: dom.IDimension = new dom.Dimension(10, 10)
 	) {
 		super();
 		this._resizableNode.domNode.style.position = 'absolute';
 		this._resizableNode.minSize = new dom.Dimension(10, 10);
 		this._resizableNode.enableSashes(true, true, true, true);
-		this._resizableNode.layout(_initialSize.height, _initialSize.width);
+		this._resizableNode.layout(initialSize.height, initialSize.width);
 		this._register(this._resizableNode.onDidResize(e => {
 			this._resize(new dom.Dimension(e.dimension.width, e.dimension.height));
 			if (e.done) {
@@ -89,7 +87,7 @@ export abstract class ResizableContentWidget extends Disposable implements ICont
 		const maxHeightBelow = Math.min(this._availableVerticalSpaceBelow(showAtPosition) ?? Infinity, widgetHeight);
 		const maxHeightAbove = Math.min(this._availableVerticalSpaceAbove(showAtPosition) ?? Infinity, widgetHeight);
 		const maxHeight = Math.min(Math.max(maxHeightAbove, maxHeightBelow), widgetHeight);
-		const height = clamp(widgetHeight, MIN_HEIGHT, maxHeight);
+		const height = Math.min(widgetHeight, maxHeight);
 		let renderingAbove: ContentWidgetPositionPreference;
 		if (this._editor.getOption(EditorOption.hover).above) {
 			renderingAbove = height <= maxHeightAbove ? ContentWidgetPositionPreference.ABOVE : ContentWidgetPositionPreference.BELOW;