Merge pull request #214572 from SimonSiefke/feature/font-picker

feature: support font family picker in settings

Author: rzhao271

src/vs/base/browser/fonts.ts

@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isMacintosh, isWindows } from '../common/platform.js';
+import { mainWindow } from './window.js';
+import type { IJSONSchemaSnippet } from '../common/jsonSchema.js';
+import { isElectron, isMacintosh, isWindows } from '../common/platform.js';
 
 /**
  * The best font-family to be used in CSS based on the platform:
@@ -14,3 +16,34 @@ import { isMacintosh, isWindows } from '../common/platform.js';
  * Note: this currently does not adjust for different locales.
  */
 export const DEFAULT_FONT_FAMILY = isWindows ? '"Segoe WPC", "Segoe UI", sans-serif' : isMacintosh ? '-apple-system, BlinkMacSystemFont, sans-serif' : 'system-ui, "Ubuntu", "Droid Sans", sans-serif';
+
+interface FontData {
+	readonly family: string;
+}
+
+export const getFonts = async (): Promise<string[]> => {
+	try {
+		// @ts-ignore
+		const fonts = await mainWindow.queryLocalFonts() as FontData[];
+		const fontsArray = [...fonts];
+		const families = fontsArray.map(font => font.family);
+		return families;
+	} catch (error) {
+		console.error(`Failed to query fonts: ${error}`);
+		return [];
+	}
+};
+
+
+export const getFontSnippets = async (): Promise<IJSONSchemaSnippet[]> => {
+	if (!isElectron) {
+		return [];
+	}
+	const fonts = await getFonts();
+	const snippets: IJSONSchemaSnippet[] = fonts.map(font => {
+		return {
+			body: `${font}`
+		};
+	});
+	return snippets;
+};

src/vs/code/electron-main/app.ts

@@ -174,6 +174,7 @@ export class CodeApplication extends Disposable {
 
 		const allowedPermissionsInCore = new Set([
 			'media',
+			'font-access',
 			'local-fonts',
 			// TODO(deepak1556): Should be removed once migration is complete
 			// https://github.com/microsoft/vscode/issues/239228

src/vs/editor/common/config/editorConfigurationSchema.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type { IJSONSchemaSnippet } from '../../../base/common/jsonSchema.js';
 import { diffEditorDefaultOptions } from './diffEditor.js';
 import { editorOptionsRegistry } from './editorOptions.js';
 import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
@@ -318,3 +319,15 @@ export function isDiffEditorConfigurationKey(key: string): boolean {
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 configurationRegistry.registerConfiguration(editorConfiguration);
+
+export async function registerEditorFontConfigurations(getFontSnippets: () => Promise<IJSONSchemaSnippet[]>) {
+	const editorKeysWithFont = ['editor.fontFamily'];
+	const fontSnippets = await getFontSnippets();
+	for (const key of editorKeysWithFont) {
+		if (
+			editorConfiguration.properties && editorConfiguration.properties[key]
+		) {
+			editorConfiguration.properties[key].defaultSnippets = fontSnippets;
+		}
+	}
+}

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -72,6 +72,8 @@ import { DynamicEditorConfigurations } from './editorConfiguration.js';
 import { ConfigureEditorAction, ConfigureEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from '../../actions/layoutActions.js';
 import { ICommandAction } from '../../../../platform/action/common/action.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { getFontSnippets } from '../../../../base/browser/fonts.js';
+import { registerEditorFontConfigurations } from '../../../../editor/common/config/editorConfigurationSchema.js';
 
 //#region Editor Registrations
 
@@ -1102,3 +1104,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
 });
 
 //#endregion
+
+
+registerEditorFontConfigurations(getFontSnippets);

src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { getFontSnippets } from '../../../../base/browser/fonts.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { isIOS, isWindows } from '../../../../base/common/platform.js';
@@ -66,7 +67,7 @@ registerWorkbenchContribution2(RemoteTerminalBackendContribution.ID, RemoteTermi
 
 // Register configurations
 registerTerminalPlatformConfiguration();
-registerTerminalConfiguration();
+registerTerminalConfiguration(getFontSnippets);
 
 // Register editor/dnd contributions
 Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(TerminalEditorInput.ID, TerminalInputSerializer);

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from '../../../../base/common/codicons.js';
+import { IJSONSchemaSnippet } from '../../../../base/common/jsonSchema.js';
 import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
@@ -174,7 +175,7 @@ const terminalConfiguration: IConfigurationNode = {
 		},
 		[TerminalSettingId.FontFamily]: {
 			markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal. Defaults to {0}'s value.", '`#editor.fontFamily#`'),
-			type: 'string'
+			type: 'string',
 		},
 		[TerminalSettingId.FontLigaturesEnabled]: {
 			markdownDescription: localize('terminal.integrated.fontLigatures.enabled', "Controls whether font ligatures are enabled in the terminal. Ligatures will only work if the configured {0} supports them.", `\`#${TerminalSettingId.FontFamily}#\``),
@@ -643,9 +644,13 @@ const terminalConfiguration: IConfigurationNode = {
 	}
 };
 
-export function registerTerminalConfiguration() {
+export async function registerTerminalConfiguration(getFontSnippets: () => Promise<IJSONSchemaSnippet[]>) {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 	configurationRegistry.registerConfiguration(terminalConfiguration);
+	const fontsSnippets = await getFontSnippets();
+	if (terminalConfiguration.properties) {
+		terminalConfiguration.properties[TerminalSettingId.FontFamily].defaultSnippets = fontsSnippets;
+	}
 }
 
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)