Relax color parsing

alexdima · alexdima · commit 8c92d305bda6 · 2017-02-13T12:31:49.000+01:00
diff --git a/src/vs/editor/common/view/minimapCharRenderer.ts b/src/vs/editor/common/view/minimapCharRenderer.ts
@@ -91,10 +91,11 @@ export class MinimapColors {
 			return new ParsedColor(0, 0, 0);
 		}
 		if (color.charCodeAt(0) === CharCode.Hash) {
-			color = color.substr(1);
+			color = color.substr(1, 6);
+		} else {
+			color = color.substr(0, 6);
 		}
 		if (color.length !== 6) {
-			console.warn('INVALID COLOR: ' + color); // TODO@minimap
 			return new ParsedColor(0, 0, 0);
 		}
 
diff --git a/src/vs/editor/test/common/view/minimapCharRenderer.test.ts b/src/vs/editor/test/common/view/minimapCharRenderer.test.ts
@@ -23,10 +23,10 @@ suite('MinimapColors', () => {
 	test('parseColor', () => {
 		assertInvalidParseColor(null);
 		assertInvalidParseColor('');
-		assertInvalidParseColor('1234567');
 		assertParseColor('FFFFG0', new ParsedColor(255, 255, 0));
 		assertParseColor('FFFFg0', new ParsedColor(255, 255, 0));
 		assertParseColor('-FFF00', new ParsedColor(15, 255, 0));
+		assertParseColor('0102030', new ParsedColor(1, 2, 3));
 
 		assertParseColor('000000', new ParsedColor(0, 0, 0));
 		assertParseColor('010203', new ParsedColor(1, 2, 3));

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,11 @@ export class MinimapColors {`
`91`	`91`	`return new ParsedColor(0, 0, 0);`
`92`	`92`	`}`
`93`	`93`	`if (color.charCodeAt(0) === CharCode.Hash) {`
`94`		`- color = color.substr(1);`
	`94`	`+ color = color.substr(1, 6);`
	`95`	`+ } else {`
	`96`	`+ color = color.substr(0, 6);`
`95`	`97`	`}`
`96`	`98`	`if (color.length !== 6) {`
`97`		`- console.warn('INVALID COLOR: ' + color); // TODO@minimap`
`98`	`99`	`return new ParsedColor(0, 0, 0);`
`99`	`100`	`}`
`100`	`101`