Merge pull request microsoft#153424 from TheV360/main

Author: jrieken

src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts

@@ -468,7 +468,7 @@ export class InlayHintsController implements IEditorContribution {
 
 
 		//
-		const { fontSize, fontFamily, padding } = this._getLayoutInfo();
+		const { fontSize, fontFamily, padding, isUniform } = this._getLayoutInfo();
 		const fontFamilyVar = '--code-editorInlayHintsFontFamily';
 		this._editor.getContainerDomNode().style.setProperty(fontFamilyVar, fontFamily);
 
@@ -493,7 +493,7 @@ export class InlayHintsController implements IEditorContribution {
 				const cssProperties: CssProperties = {
 					fontSize: `${fontSize}px`,
 					fontFamily: `var(${fontFamilyVar}), ${EDITOR_FONT_DEFAULTS.fontFamily}`,
-					verticalAlign: 'middle',
+					verticalAlign: isUniform ? 'baseline' : 'middle',
 				};
 
 				if (isNonEmptyArray(item.hint.textEdits)) {
@@ -587,13 +587,23 @@ export class InlayHintsController implements IEditorContribution {
 
 	private _getLayoutInfo() {
 		const options = this._editor.getOption(EditorOption.inlayHints);
+		const padding = options.padding;
+
 		const editorFontSize = this._editor.getOption(EditorOption.fontSize);
+		const editorFontFamily = this._editor.getOption(EditorOption.fontFamily);
+
 		let fontSize = options.fontSize;
 		if (!fontSize || fontSize < 5 || fontSize > editorFontSize) {
 			fontSize = editorFontSize;
 		}
-		const fontFamily = options.fontFamily || this._editor.getOption(EditorOption.fontFamily);
-		return { fontSize, fontFamily, padding: options.padding };
+
+		const fontFamily = options.fontFamily || editorFontFamily;
+
+		const isUniform = !padding
+			&& fontFamily === editorFontFamily
+			&& fontSize === editorFontSize;
+
+		return { fontSize, fontFamily, padding, isUniform };
 	}
 
 	private _removeAllDecorations(): void {