Fixes microsoft#40706: Align Inspect TM Scopes widget implementation …

…with the runtime one
wminos · Feb 5, 2018 · d7cbcea · d7cbcea
1 parent f6feb04
commit d7cbcea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts b/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts
@@ -273,7 +273,7 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget {
 
 		let theme = this._themeService.getColorTheme();
 		result += `<hr class="tm-metadata-separator"/>`;
-		let matchingRule = findMatchingThemeRule(theme, data.tokens1[token1Index].scopes);
+		let matchingRule = findMatchingThemeRule(theme, data.tokens1[token1Index].scopes, false);
 		if (matchingRule) {
 			result += `<code class="tm-theme-selector">${matchingRule.rawSelector}\n${JSON.stringify(matchingRule.settings, null, '\t')}</code>`;
 		} else {

diff --git a/src/vs/workbench/services/textMate/electron-browser/TMHelper.ts b/src/vs/workbench/services/textMate/electron-browser/TMHelper.ts
@@ -7,25 +7,25 @@
 
 import { IColorTheme, ITokenColorizationSetting } from 'vs/workbench/services/themes/common/workbenchThemeService';
 
-export function findMatchingThemeRule(theme: IColorTheme, scopes: string[]): ThemeRule {
+export function findMatchingThemeRule(theme: IColorTheme, scopes: string[], onlyColorRules: boolean = true): ThemeRule {
 	for (let i = scopes.length - 1; i >= 0; i--) {
 		let parentScopes = scopes.slice(0, i);
 		let scope = scopes[i];
-		let r = findMatchingThemeRule2(theme, scope, parentScopes);
+		let r = findMatchingThemeRule2(theme, scope, parentScopes, onlyColorRules);
 		if (r) {
 			return r;
 		}
 	}
 	return null;
 }
 
-function findMatchingThemeRule2(theme: IColorTheme, scope: string, parentScopes: string[]): ThemeRule {
+function findMatchingThemeRule2(theme: IColorTheme, scope: string, parentScopes: string[], onlyColorRules: boolean): ThemeRule {
 	let result: ThemeRule = null;
 
 	// Loop backwards, to ensure the last most specific rule wins
 	for (let i = theme.tokenColors.length - 1; i >= 0; i--) {
 		let rule = theme.tokenColors[i];
-		if (!rule.settings.foreground) {
+		if (onlyColorRules && !rule.settings.foreground) {
 			continue;
 		}