Closes #3306 adds inline blame font controls

Author: eamodio

CHANGELOG.md

@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Adds a _Copy as Markdown_ context menu command to autolinks in the _Autolinked Issues and Pull Requests_ section in the _Search & Compare_ view
 - Adds a _Connect Remote Integration_ command to the _Autolinked Issues and Pull Requests_ section in the _Search & Compare_ view
+- Adds `gitlens.currentLine.fontFamily`, `gitlens.currentLine.fontSize`, `gitlens.currentLine.fontStyle`, `gitlens.currentLine.fontWeight` settings to specify the font (family, size, style, and weight respectively) of the _Inline Blame_ annotation — closes [#3306](https://github.com/gitkraken/vscode-gitlens/issues/3306)
+- Adds `gitlens.blame.fontStyle` settings to specify the font style of the _File Blame_ annotations
 
 ### Changed
 

package.json

@@ -99,6 +99,34 @@
 						"scope": "window",
 						"order": 31
 					},
+					"gitlens.currentLine.fontFamily": {
+						"type": "string",
+						"default": "",
+						"markdownDescription": "Specifies the font family of the inline blame annotation",
+						"scope": "window",
+						"order": 33
+					},
+					"gitlens.currentLine.fontSize": {
+						"type": "number",
+						"default": 0,
+						"markdownDescription": "Specifies the font size of the inline blame annotation",
+						"scope": "window",
+						"order": 34
+					},
+					"gitlens.currentLine.fontStyle": {
+						"type": "string",
+						"default": "normal",
+						"markdownDescription": "Specifies the font style of the inline blame annotation",
+						"scope": "window",
+						"order": 35
+					},
+					"gitlens.currentLine.fontWeight": {
+						"type": "string",
+						"default": "normal",
+						"markdownDescription": "Specifies the font weight of the inline blame annotation",
+						"scope": "window",
+						"order": 36
+					},
 					"gitlens.currentLine.scrollable": {
 						"type": "boolean",
 						"default": true,
@@ -2398,21 +2426,28 @@
 						"default": "",
 						"markdownDescription": "Specifies the font family of the file blame annotations",
 						"scope": "window",
-						"order": 21
+						"order": 22
 					},
 					"gitlens.blame.fontSize": {
 						"type": "number",
 						"default": 0,
 						"markdownDescription": "Specifies the font size of the file blame annotations",
 						"scope": "window",
-						"order": 22
+						"order": 23
+					},
+					"gitlens.blame.fontStyle": {
+						"type": "string",
+						"default": "normal",
+						"markdownDescription": "Specifies the font style of the file blame annotations",
+						"scope": "window",
+						"order": 24
 					},
 					"gitlens.blame.fontWeight": {
 						"type": "string",
 						"default": "normal",
 						"markdownDescription": "Specifies the font weight of the file blame annotations",
 						"scope": "window",
-						"order": 22
+						"order": 25
 					},
 					"gitlens.blame.heatmap.enabled": {
 						"type": "boolean",

src/annotations/annotations.ts

@@ -215,14 +215,14 @@ export function getGutterRenderOptions(
 		borderWidth: borderWidth,
 		color: new ThemeColor('gitlens.gutterForegroundColor' satisfies Colors),
 		fontWeight: fontOptions.weight ?? 'normal',
-		fontStyle: fontOptions.weight ?? 'normal',
+		fontStyle: fontOptions.style ?? 'normal',
 		height: '100%',
 		margin: '0 26px -1px 0',
 		textDecoration: `${separateLines ? 'overline solid rgba(0, 0, 0, .2)' : 'none'};box-sizing: border-box${
 			avatars ? ';padding: 0 0 0 18px' : ''
 		}${fontOptions.family ? `;font-family: ${fontOptions.family}` : ''}${
 			fontOptions.size ? `;font-size: ${fontOptions.size}px` : ''
-		}`,
+		};`,
 		width: width,
 		uncommittedColor: new ThemeColor('gitlens.gutterUncommittedForegroundColor' satisfies Colors),
 	};
@@ -234,6 +234,7 @@ export function getInlineDecoration(
 	// editorLine: number,
 	format: string,
 	formatOptions?: CommitFormatOptions,
+	fontOptions?: BlameFontOptions,
 	scrollable: boolean = true,
 ): Partial<DecorationOptions> {
 	// TODO: Enable this once there is better caching
@@ -254,10 +255,12 @@ export function getInlineDecoration(
 				backgroundColor: new ThemeColor('gitlens.trailingLineBackgroundColor' satisfies Colors),
 				color: new ThemeColor('gitlens.trailingLineForegroundColor' satisfies Colors),
 				contentText: pad(message.replace(/ /g, GlyphChars.Space), 1, 1),
-				fontWeight: 'normal',
-				fontStyle: 'normal',
+				fontWeight: fontOptions?.weight ?? 'normal',
+				fontStyle: fontOptions?.style ?? 'normal',
 				// Pull the decoration out of the document flow if we want to be scrollable
-				textDecoration: `none;${scrollable ? '' : ' position: absolute;'}`,
+				textDecoration: `none${scrollable ? '' : ';position: absolute'}${
+					fontOptions?.family ? `;font-family: ${fontOptions.family}` : ''
+				}${fontOptions?.size ? `;font-size: ${fontOptions.size}px` : ''};`,
 			},
 		},
 	};

src/annotations/gutterBlameAnnotationProvider.ts

@@ -25,6 +25,7 @@ const maxSmallIntegerV8 = 2 ** 30 - 1; // Max number that can be stored in V8's
 export interface BlameFontOptions {
 	family: string;
 	size: number;
+	style: string;
 	weight: string;
 }
 
@@ -77,6 +78,7 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
 		const fontOptions: BlameFontOptions = {
 			family: configuration.get('blame.fontFamily'),
 			size: configuration.get('blame.fontSize'),
+			style: configuration.get('blame.fontStyle'),
 			weight: configuration.get('blame.fontWeight'),
 		};
 

src/annotations/lineAnnotationController.ts

@@ -17,6 +17,7 @@ import { getSettledValue } from '../system/promise';
 import { isTextEditor } from '../system/utils';
 import type { LinesChangeEvent, LineState } from '../trackers/lineTracker';
 import { getInlineDecoration } from './annotations';
+import type { BlameFontOptions } from './gutterBlameAnnotationProvider';
 
 const annotationDecoration: TextEditorDecorationType = window.createTextEditorDecorationType({
 	after: {
@@ -300,6 +301,13 @@ export class LineAnnotationController implements Disposable {
 			prs: Map<string, MaybePausedResult<PullRequest | undefined>> | undefined,
 			timeout?: number,
 		) {
+			const fontOptions: BlameFontOptions = {
+				family: cfg.fontFamily,
+				size: cfg.fontSize,
+				style: cfg.fontStyle,
+				weight: cfg.fontWeight,
+			};
+
 			const decorations = [];
 
 			for (const [l, state] of lines) {
@@ -319,6 +327,7 @@ export class LineAnnotationController implements Disposable {
 						pullRequest: pr?.value,
 						pullRequestPendingMessage: `PR ${GlyphChars.Ellipsis}`,
 					},
+					fontOptions,
 					cfg.scrollable,
 				) as DecorationOptions;
 				decoration.range = editor.document.validateRange(new Range(l, maxSmallIntegerV8, l, maxSmallIntegerV8));

src/config.ts

@@ -32,6 +32,7 @@ export interface Config {
 		readonly dateFormat: DateTimeFormat | (string & object) | null;
 		readonly fontFamily: string;
 		readonly fontSize: number;
+		readonly fontStyle: string;
 		readonly fontWeight: string;
 		readonly format: string;
 		readonly heatmap: {
@@ -60,12 +61,16 @@ export interface Config {
 	readonly currentLine: {
 		readonly dateFormat: string | null;
 		/*readonly*/ enabled: boolean;
+		readonly fontFamily: string;
+		readonly fontSize: number;
+		readonly fontStyle: string;
+		readonly fontWeight: string;
 		readonly format: string;
-		readonly uncommittedChangesFormat: string | null;
 		readonly pullRequests: {
 			readonly enabled: boolean;
 		};
 		readonly scrollable: boolean;
+		readonly uncommittedChangesFormat: string | null;
 	};
 	readonly debug: boolean;
 	readonly deepLinks: {