[decorators] only inclode border and outline styles if color is set. For microsoft#27790.

aeschli · aeschli · commit 724f31f5bc95 · 2017-06-01T15:09:20.000+02:00
diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
@@ -343,9 +343,10 @@ class DecorationCSSRules {
 			return '';
 		}
 		let cssTextArr: string[] = [];
-		this.collectCSSText(opts, ['backgroundColor', 'outline', 'outlineColor', 'outlineStyle', 'outlineWidth'], cssTextArr);
-		this.collectBorderSettingsCSSText(opts, cssTextArr);
-
+		this.collectCSSText(opts, ['backgroundColor'], cssTextArr);
+		if (this.collectCSSText(opts, ['outline', 'outlineColor'], cssTextArr)) {
+			this.collectCSSText(opts, ['outlineStyle', 'outlineWidth'], cssTextArr);
+		}
 		return cssTextArr.join('');
 	}
 
@@ -415,10 +416,9 @@ class DecorationCSSRules {
 		return cssTextArr.join('');
 	}
 
-	private static border_rules = ['border', 'borderRadius', 'borderColor', 'borderSpacing', 'borderStyle', 'borderWidth'];
-
 	private collectBorderSettingsCSSText(opts: any, cssTextArr: string[]): boolean {
-		if (this.collectCSSText(opts, DecorationCSSRules.border_rules, cssTextArr)) {
+		if (this.collectCSSText(opts, ['border', 'borderColor'], cssTextArr)) {
+			this.collectCSSText(opts, ['borderRadius', 'borderSpacing', 'borderStyle', 'borderWidth'], cssTextArr);
 			cssTextArr.push(strings.format('box-sizing: border-box;'));
 			return true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -343,9 +343,10 @@ class DecorationCSSRules {`
`343`	`343`	`return '';`
`344`	`344`	`}`
`345`	`345`	`let cssTextArr: string[] = [];`
`346`		`- this.collectCSSText(opts, ['backgroundColor', 'outline', 'outlineColor', 'outlineStyle', 'outlineWidth'], cssTextArr);`
`347`		`- this.collectBorderSettingsCSSText(opts, cssTextArr);`
`348`		`-`
	`346`	`+ this.collectCSSText(opts, ['backgroundColor'], cssTextArr);`
	`347`	`+ if (this.collectCSSText(opts, ['outline', 'outlineColor'], cssTextArr)) {`
	`348`	`+ this.collectCSSText(opts, ['outlineStyle', 'outlineWidth'], cssTextArr);`
	`349`	`+ }`
`349`	`350`	`return cssTextArr.join('');`
`350`	`351`	`}`
`351`	`352`
`@@ -415,10 +416,9 @@ class DecorationCSSRules {`
`415`	`416`	`return cssTextArr.join('');`
`416`	`417`	`}`
`417`	`418`
`418`		`- private static border_rules = ['border', 'borderRadius', 'borderColor', 'borderSpacing', 'borderStyle', 'borderWidth'];`
`419`		`-`
`420`	`419`	`private collectBorderSettingsCSSText(opts: any, cssTextArr: string[]): boolean {`
`421`		`- if (this.collectCSSText(opts, DecorationCSSRules.border_rules, cssTextArr)) {`
	`420`	`+ if (this.collectCSSText(opts, ['border', 'borderColor'], cssTextArr)) {`
	`421`	`+ this.collectCSSText(opts, ['borderRadius', 'borderSpacing', 'borderStyle', 'borderWidth'], cssTextArr);`
`422`	`422`	`cssTextArr.push(strings.format('box-sizing: border-box;'));`
`423`	`423`	`return true;`
`424`	`424`	`}`