[theme] normalizeColor drops colors with alpha

aeschli · aeschli · commit 13dd07b8a811 · 2020-01-27T11:13:09.000+01:00
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -788,29 +788,27 @@ function normalizeColor(color: string | Color | undefined | null): string | unde
 	if (typeof color !== 'string') {
 		color = Color.Format.CSS.formatHexA(color, true);
 	}
-	if (color.charCodeAt(0) !== CharCode.Hash) {
+	const len = color.length;
+	if (color.charCodeAt(0) !== CharCode.Hash || (len !== 4 && len !== 5 && len !== 7 && len !== 9)) {
 		return undefined;
 	}
 	let result = [CharCode.Hash];
-	const len = color.length;
+
 	for (let i = 1; i < len; i++) {
 		const upper = hexUpper(color.charCodeAt(i));
 		if (!upper) {
 			return undefined;
 		}
 		result.push(upper);
-		if (len === 3 || len === 4) {
+		if (len === 4 || len === 5) {
 			result.push(upper);
 		}
 	}
 
 	if (result.length === 9 && result[7] === CharCode.F && result[8] === CharCode.F) {
 		result.length = 7;
 	}
-	if (result.length === 7) {
-		return String.fromCharCode(...result);
-	}
-	return undefined;
+	return String.fromCharCode(...result);
 }
 
 function hexUpper(charCode: CharCode): number {

Original file line number	Diff line number	Diff line change
`@@ -788,29 +788,27 @@ function normalizeColor(color: string \| Color \| undefined \| null): string \| unde`
`788`	`788`	`if (typeof color !== 'string') {`
`789`	`789`	`color = Color.Format.CSS.formatHexA(color, true);`
`790`	`790`	`}`
`791`		`- if (color.charCodeAt(0) !== CharCode.Hash) {`
	`791`	`+ const len = color.length;`
	`792`	`+ if (color.charCodeAt(0) !== CharCode.Hash \|\| (len !== 4 && len !== 5 && len !== 7 && len !== 9)) {`
`792`	`793`	`return undefined;`
`793`	`794`	`}`
`794`	`795`	`let result = [CharCode.Hash];`
`795`		`- const len = color.length;`
	`796`	`+`
`796`	`797`	`for (let i = 1; i < len; i++) {`
`797`	`798`	`const upper = hexUpper(color.charCodeAt(i));`
`798`	`799`	`if (!upper) {`
`799`	`800`	`return undefined;`
`800`	`801`	`}`
`801`	`802`	`result.push(upper);`
`802`		`- if (len === 3 \|\| len === 4) {`
	`803`	`+ if (len === 4 \|\| len === 5) {`
`803`	`804`	`result.push(upper);`
`804`	`805`	`}`
`805`	`806`	`}`
`806`	`807`
`807`	`808`	`if (result.length === 9 && result[7] === CharCode.F && result[8] === CharCode.F) {`
`808`	`809`	`result.length = 7;`
`809`	`810`	`}`
`810`		`- if (result.length === 7) {`
`811`		`- return String.fromCharCode(...result);`
`812`		`- }`
`813`		`- return undefined;`
	`811`	`+ return String.fromCharCode(...result);`
`814`	`812`	`}`
`815`	`813`
`816`	`814`	`function hexUpper(charCode: CharCode): number {`