[semantic highlighting] functions in josef.rouge-theme get wrong color. Fixes microsoft#92536

aeschli · aeschli · commit f8a038284bde · 2020-03-15T17:23:47.000+01:00
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -289,9 +289,11 @@ export class ColorThemeData implements IColorTheme {
 						const settings = tokenColors[i].settings;
 						if (score >= foregroundScore && settings.foreground) {
 							foreground = settings.foreground;
+							foregroundScore = score;
 						}
 						if (score >= fontStyleScore && types.isString(settings.fontStyle)) {
 							fontStyle = settings.fontStyle;
+							fontStyleScore = score;
 						}
 					}
 				}
@@ -642,7 +644,7 @@ function nameMatcher(identifers: string[], scope: ProbeScope): number {
 	let lastScopeIndex = scope.length - 1;
 	let lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], identifers.length);
 	if (lastIdentifierIndex >= 0) {
-		const score = (lastIdentifierIndex + 1) * 0x10000 + scope.length;
+		const score = (lastIdentifierIndex + 1) * 0x10000 + identifers[lastIdentifierIndex].length;
 		while (lastScopeIndex >= 0) {
 			lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], lastIdentifierIndex);
 			if (lastIdentifierIndex === -1) {
diff --git a/src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts b/src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts
@@ -289,6 +289,41 @@ suite('Themes - TokenStyleResolving', () => {
 
 	});
 
+
+	test('resolveScopes - match most specific', async () => {
+		const themeData = ColorThemeData.createLoadedEmptyTheme('test', 'test');
+
+		const customTokenColors: ITokenColorCustomizations = {
+			textMateRules: [
+				{
+					scope: 'entity.name.type',
+					settings: {
+						fontStyle: 'underline',
+						foreground: '#A6E22E'
+					}
+				},
+				{
+					scope: 'entity.name.type.class',
+					settings: {
+						foreground: '#FF00FF'
+					}
+				},
+				{
+					scope: 'entity.name',
+					settings: {
+						foreground: '#FFFFFF'
+					}
+				},
+			]
+		};
+
+		themeData.setCustomTokenColors(customTokenColors);
+
+		const tokenStyle = themeData.resolveScopes([['entity.name.type.class']]);
+		assertTokenStyle(tokenStyle, ts('#FF00FF', { underline: true }), 'entity.name.type.class');
+
+	});
+
 	test('rule matching', async () => {
 		const themeData = ColorThemeData.createLoadedEmptyTheme('test', 'test');
 		themeData.setCustomColors({ 'editor.foreground': '#000000' });

Original file line number	Diff line number	Diff line change
`@@ -289,9 +289,11 @@ export class ColorThemeData implements IColorTheme {`
`289`	`289`	`const settings = tokenColors[i].settings;`
`290`	`290`	`if (score >= foregroundScore && settings.foreground) {`
`291`	`291`	`foreground = settings.foreground;`
	`292`	`+ foregroundScore = score;`
`292`	`293`	`}`
`293`	`294`	`if (score >= fontStyleScore && types.isString(settings.fontStyle)) {`
`294`	`295`	`fontStyle = settings.fontStyle;`
	`296`	`+ fontStyleScore = score;`
`295`	`297`	`}`
`296`	`298`	`}`
`297`	`299`	`}`
`@@ -642,7 +644,7 @@ function nameMatcher(identifers: string[], scope: ProbeScope): number {`
`642`	`644`	`let lastScopeIndex = scope.length - 1;`
`643`	`645`	`let lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], identifers.length);`
`644`	`646`	`if (lastIdentifierIndex >= 0) {`
`645`		`- const score = (lastIdentifierIndex + 1) * 0x10000 + scope.length;`
	`647`	`+ const score = (lastIdentifierIndex + 1) * 0x10000 + identifers[lastIdentifierIndex].length;`
`646`	`648`	`while (lastScopeIndex >= 0) {`
`647`	`649`	`lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], lastIdentifierIndex);`
`648`	`650`	`if (lastIdentifierIndex === -1) {`