editor.tokenColorCustomizations not applying font style. Fixes microsoft#42939

aeschli · aeschli · commit 239c2d1d60ea · 2018-02-07T22:51:42.000+01:00
diff --git a/src/vs/workbench/services/themes/common/colorThemeSchema.ts b/src/vs/workbench/services/themes/common/colorThemeSchema.ts
@@ -130,12 +130,13 @@ export const tokenColorizationSettingSchema: IJSONSchema = {
 		},
 		fontStyle: {
 			type: 'string',
-			description: nls.localize('schema.token.fontStyle', 'Font style of the rule: One or a combination of \'italic\', \'bold\' and \'underline\''),
+			description: nls.localize('schema.token.fontStyle', 'Font style of the rule: \'italic\', \'bold\' or \'underline\' or a combination. The empty string unsets inherited settings.'),
 			pattern: '^(\\s*\\b(italic|bold|underline))*\\s*$',
-			patternErrorMessage: nls.localize('schema.fontStyle.error', 'Font style must be a combination of \'italic\', \'bold\' and \'underline\''),
+			patternErrorMessage: nls.localize('schema.fontStyle.error', 'Font style must be \'italic\', \'bold\' or \'underline\' or a combination or the empty string.'),
 			defaultSnippets: [{ body: 'italic' }, { body: 'bold' }, { body: 'underline' }, { body: 'italic bold' }, { body: 'italic underline' }, { body: 'bold underline' }, { body: 'italic bold underline' }]
 		}
 	},
+	additionalProperties: false,
 	defaultSnippets: [{ body: { foreground: '${1:#FF0000}', fontStyle: '${2:bold}' } }]
 };
 
@@ -176,7 +177,8 @@ export function tokenColorsSchema(description: string): IJSONSchema {
 					]
 				},
 				settings: tokenColorizationSettingSchema
-			}
+			},
+			additionalProperties: false
 		}
 	};
 }

Original file line number	Diff line number	Diff line change
`@@ -130,12 +130,13 @@ export const tokenColorizationSettingSchema: IJSONSchema = {`
`130`	`130`	`},`
`131`	`131`	`fontStyle: {`
`132`	`132`	`type: 'string',`
`133`		`- description: nls.localize('schema.token.fontStyle', 'Font style of the rule: One or a combination of \'italic\', \'bold\' and \'underline\''),`
	`133`	`+ description: nls.localize('schema.token.fontStyle', 'Font style of the rule: \'italic\', \'bold\' or \'underline\' or a combination. The empty string unsets inherited settings.'),`
`134`	`134`	`pattern: '^(\\s\\b(italic\|bold\|underline))\\s*$',`
`135`		`- patternErrorMessage: nls.localize('schema.fontStyle.error', 'Font style must be a combination of \'italic\', \'bold\' and \'underline\''),`
	`135`	`+ patternErrorMessage: nls.localize('schema.fontStyle.error', 'Font style must be \'italic\', \'bold\' or \'underline\' or a combination or the empty string.'),`
`136`	`136`	`defaultSnippets: [{ body: 'italic' }, { body: 'bold' }, { body: 'underline' }, { body: 'italic bold' }, { body: 'italic underline' }, { body: 'bold underline' }, { body: 'italic bold underline' }]`
`137`	`137`	`}`
`138`	`138`	`},`
	`139`	`+ additionalProperties: false,`
`139`	`140`	`defaultSnippets: [{ body: { foreground: '${1:#FF0000}', fontStyle: '${2:bold}' } }]`
`140`	`141`	`};`
`141`	`142`
`@@ -176,7 +177,8 @@ export function tokenColorsSchema(description: string): IJSONSchema {`
`176`	`177`	`]`
`177`	`178`	`},`
`178`	`179`	`settings: tokenColorizationSettingSchema`
`179`		`- }`
	`180`	`+ },`
	`181`	`+ additionalProperties: false`
`180`	`182`	`}`
`181`	`183`	`};`
`182`	`184`	`}`