daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix font family fallback in parameter hints (#221737) 

Fixes #211714
pull/221752/head
Matt Bierner 2024-07-15 11:39:33 -07:00 committed by GitHub
parent 86495e947b
commit 4caa46afc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/lib/stylelint/vscode-known-variables.json
View File

@ -835,6 +835,8 @@
"--vscode-editorStickyScroll-scrollableWidth",
"--vscode-editorStickyScroll-foldingOpacityTransition",
"--window-border-color",
"--vscode-parameterHintsWidget-editorFontFamily",
"--vscode-parameterHintsWidget-editorFontFamilyDefault",
"--workspace-trust-check-color",
"--workspace-trust-selected-color",
"--workspace-trust-unselected-color",

4
src/vs/editor/contrib/parameterHints/browser/parameterHints.css
View File

@ -69,6 +69,10 @@
border-bottom: 1px solid var(--vscode-editorHoverWidget-border);
}
.monaco-editor .parameter-hints-widget .code {
font-family: var(--vscode-parameterHintsWidget-editorFontFamily), var(--vscode-parameterHintsWidget-editorFontFamilyDefault);
}
.monaco-editor .parameter-hints-widget .docs {
padding: 0 10px 0 5px;
white-space: pre-wrap;

14
src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
View File

@ -14,7 +14,7 @@ import { escapeRegExpCharacters } from 'vs/base/common/strings';
import { assertIsDefined } from 'vs/base/common/types';
import 'vs/css!./parameterHints';
import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
import { EditorOption } from 'vs/editor/common/config/editorOptions';
import { EDITOR_FONT_DEFAULTS, EditorOption } from 'vs/editor/common/config/editorOptions';
import * as languages from 'vs/editor/common/languages';
import { ILanguageService } from 'vs/editor/common/languages/language';
import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
@ -126,9 +126,13 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
if (!this.domNodes) {
return;
}
const fontInfo = this.editor.getOption(EditorOption.fontInfo);
this.domNodes.element.style.fontSize = `${fontInfo.fontSize}px`;
this.domNodes.element.style.lineHeight = `${fontInfo.lineHeight / fontInfo.fontSize}`;
const element = this.domNodes.element;
element.style.fontSize = `${fontInfo.fontSize}px`;
element.style.lineHeight = `${fontInfo.lineHeight / fontInfo.fontSize}`;
element.style.setProperty('--vscode-parameterHintsWidget-editorFontFamily', fontInfo.fontFamily);
element.style.setProperty('--vscode-parameterHintsWidget-editorFontFamilyDefault', EDITOR_FONT_DEFAULTS.fontFamily);
};
updateFont();
@ -203,10 +207,6 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
}
const code = dom.append(this.domNodes.signature, $('.code'));
const fontInfo = this.editor.getOption(EditorOption.fontInfo);
code.style.fontSize = `${fontInfo.fontSize}px`;
code.style.fontFamily = fontInfo.fontFamily;
const hasParameters = signature.parameters.length > 0;
const activeParameterIndex = signature.activeParameter ?? hints.activeParameter;