From 53c50875c9e17b8dfb3e410891496285f0391c09 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Wed, 11 Aug 2021 15:41:41 +0200 Subject: [PATCH] Fixes #129522 by introducing verticalAlign render option. --- src/vs/editor/browser/services/codeEditorServiceImpl.ts | 6 ++++-- src/vs/editor/common/editorCommon.ts | 1 + src/vs/editor/contrib/inlayHints/inlayHintsController.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts index 48e8b5a73cf..03468725f07 100644 --- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts +++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts @@ -387,7 +387,9 @@ export const _CSS_MAP: { [prop: string]: string; } = { margin: 'margin:{0};', padding: 'padding:{0};', width: 'width:{0};', - height: 'height:{0};' + height: 'height:{0};', + + verticalAlign: 'vertical-align:{0};', }; @@ -568,7 +570,7 @@ class DecorationCSSRules { cssTextArr.push(strings.format(_CSS_MAP.contentText, escaped)); } - this.collectCSSText(opts, ['fontStyle', 'fontWeight', 'fontSize', 'fontFamily', 'textDecoration', 'color', 'opacity', 'backgroundColor', 'margin', 'padding'], cssTextArr); + this.collectCSSText(opts, ['verticalAlign', 'fontStyle', 'fontWeight', 'fontSize', 'fontFamily', 'textDecoration', 'color', 'opacity', 'backgroundColor', 'margin', 'padding'], cssTextArr); if (this.collectCSSText(opts, ['width', 'height'], cssTextArr)) { cssTextArr.push('display:inline-block;'); } diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index 55da3496fac..490ee293fe1 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -643,6 +643,7 @@ export interface IContentDecorationRenderOptions { color?: string | ThemeColor; backgroundColor?: string | ThemeColor; opacity?: string; + verticalAlign?: string; margin?: string; padding?: string; diff --git a/src/vs/editor/contrib/inlayHints/inlayHintsController.ts b/src/vs/editor/contrib/inlayHints/inlayHintsController.ts index 809aecedd89..68b69f3c314 100644 --- a/src/vs/editor/contrib/inlayHints/inlayHintsController.ts +++ b/src/vs/editor/contrib/inlayHints/inlayHintsController.ts @@ -171,6 +171,7 @@ export class InlayHintsController implements IEditorContribution { fontFamily: `var(${fontFamilyVar})`, padding: `0px ${(fontSize / 4) | 0}px`, borderRadius: `${(fontSize / 4) | 0}px`, + verticalAlign: 'middle', }; const key = 'inlayHints-' + hash(before).toString(16); this._codeEditorService.registerDecorationType('inlay-hints-controller', key,