From 1e23c593ff427bc2d1bde8e77d484fb0381e9e4f Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 8 Jun 2016 21:41:37 -0700
Subject: [PATCH] Use valid values for terminal font config

Fixes #7420
---
 .../electron-browser/terminal.contribution.ts        |  6 ++++--
 .../parts/terminal/test/terminalConfigHelper.test.ts | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index 8ab26bc5920..6b02798e0cd 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -68,11 +68,13 @@ configurationRegistry.registerConfiguration({
 		},
 		'terminal.integrated.fontSize': {
 			'description': nls.localize('terminal.integrated.fontSize', "Controls the font size of the terminal, this defaults to editor.fontSize's value."),
-			'type': 'number'
+			'type': 'number',
+			'default': 0
 		},
 		'terminal.integrated.lineHeight': {
 			'description': nls.localize('terminal.integrated.lineHeight', "Controls the line height of the terminal, this defaults to editor.lineHeight's value."),
-			'type': 'number'
+			'type': 'number',
+			'default': 0
 		}
 	}
 });
diff --git a/src/vs/workbench/parts/terminal/test/terminalConfigHelper.test.ts b/src/vs/workbench/parts/terminal/test/terminalConfigHelper.test.ts
index ecfd3a8c248..1dbc69291f0 100644
--- a/src/vs/workbench/parts/terminal/test/terminalConfigHelper.test.ts
+++ b/src/vs/workbench/parts/terminal/test/terminalConfigHelper.test.ts
@@ -62,7 +62,7 @@ suite('Workbench - TerminalConfigHelper', () => {
 			},
 			terminal: {
 				integrated: {
-					fontFamily: undefined
+					fontFamily: 0
 				}
 			}
 		});
@@ -91,8 +91,8 @@ suite('Workbench - TerminalConfigHelper', () => {
 			},
 			terminal: {
 				integrated: {
-					fontFamily: undefined,
-					fontSize: undefined
+					fontFamily: 0,
+					fontSize: 0
 				}
 			}
 		});
@@ -106,7 +106,7 @@ suite('Workbench - TerminalConfigHelper', () => {
 			},
 			terminal: {
 				integrated: {
-					fontFamily: undefined,
+					fontFamily: 0,
 					lineHeight: 2
 				}
 			}
@@ -121,8 +121,8 @@ suite('Workbench - TerminalConfigHelper', () => {
 			},
 			terminal: {
 				integrated: {
-					fontFamily: undefined,
-					lineHeight: undefined
+					fontFamily: 0,
+					lineHeight: 0
 				}
 			}
 		});
-- 
GitLab