Merge pull request microsoft#22186 from Nashenas88/master

aeschli · web-flow · commit 4795fc438c82 · 2017-03-08T18:51:49.000+01:00
Fix borderRadius for decorations
diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
@@ -344,7 +344,7 @@ class DecorationRenderHelper {
 		return cssTextArr.join('');
 	}
 
-	private static border_rules = ['border', 'borderColor', 'borderColor', 'borderSpacing', 'borderStyle', 'borderWidth'];
+	private static border_rules = ['border', 'borderRadius', 'borderColor', 'borderSpacing', 'borderStyle', 'borderWidth'];
 
 	public static collectBorderSettingsCSSText(opts: any, cssTextArr: string[]): boolean {
 		if (DecorationRenderHelper.collectCSSText(opts, DecorationRenderHelper.border_rules, cssTextArr)) {

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ class DecorationRenderHelper {`
`344`	`344`	`return cssTextArr.join('');`
`345`	`345`	`}`
`346`	`346`
`347`		`- private static border_rules = ['border', 'borderColor', 'borderColor', 'borderSpacing', 'borderStyle', 'borderWidth'];`
	`347`	`+ private static border_rules = ['border', 'borderRadius', 'borderColor', 'borderSpacing', 'borderStyle', 'borderWidth'];`
`348`	`348`
`349`	`349`	`public static collectBorderSettingsCSSText(opts: any, cssTextArr: string[]): boolean {`
`350`	`350`	`if (DecorationRenderHelper.collectCSSText(opts, DecorationRenderHelper.border_rules, cssTextArr)) {`