Using Color.fromHex with invalid input should return null

aeschli · aeschli · commit d3a80dc181da · 2017-08-12T13:31:59.000+02:00
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -126,8 +126,12 @@ declare module 'vscode' {
 		 */
 		static fromHSLA(hue: number, saturation: number, luminance: number, alpha: number): Color;
 
-		// TODO: this isn't needed. this is a parsing util. remove
-		static fromHex(hex: string): Color;
+		/**
+		 * Creates a color by from a hex string. Supported formats are: #RRGGBB, #RRGGBBAA, #RGB, #RGBA.
+		 * <code>null</code> is returned if the string does not match one of the supported formats.
+		 * @param hex a string to parse
+		 */
+		static fromHex(hex: string): Color | null;
 	}
 
 	/**
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
@@ -1032,9 +1032,13 @@ export class Color {
 		return new Color(color.r, color.g, color.b, color.a / 255);
 	}
 
-	static fromHex(hex: string): Color {
-		const color = BaseColor.fromHex(hex).rgba;
-		return new Color(color.r, color.g, color.b, color.a / 255);
+	static fromHex(hex: string): Color | null {
+		let baseColor = BaseColor.Format.CSS.parseHex(hex);
+		if (baseColor) {
+			const rgba = baseColor.rgba;
+			return new Color(rgba.r, rgba.g, rgba.b, rgba.a / 255);
+		}
+		return null;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1032,9 +1032,13 @@ export class Color {`
`1032`	`1032`	`return new Color(color.r, color.g, color.b, color.a / 255);`
`1033`	`1033`	`}`
`1034`	`1034`
`1035`		`- static fromHex(hex: string): Color {`
`1036`		`- const color = BaseColor.fromHex(hex).rgba;`
`1037`		`- return new Color(color.r, color.g, color.b, color.a / 255);`
	`1035`	`+ static fromHex(hex: string): Color \| null {`
	`1036`	`+ let baseColor = BaseColor.Format.CSS.parseHex(hex);`
	`1037`	`+ if (baseColor) {`
	`1038`	`+ const rgba = baseColor.rgba;`
	`1039`	`+ return new Color(rgba.r, rgba.g, rgba.b, rgba.a / 255);`
	`1040`	`+ }`
	`1041`	`+ return null;`
`1038`	`1042`	`}`
`1039`	`1043`	`}`
`1040`	`1044`