Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #141171: Make sure to always set the color map on the TokenizationRegistry, even without a TMGrammarFactory

Browse Source
This commit is contained in:
Alex Dima
2022-01-24 23:34:22 +01:00
parent d0eaa89a0f
commit d9ca662b61
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
View File

@@ -152,29 +152,11 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
}
});
this._updateTheme(this._grammarFactory, this._themeService.getColorTheme(), true);
this._register(this._themeService.onDidColorThemeChange(() => {
if (this._grammarFactory) {
this._updateTheme(this._grammarFactory, this._themeService.getColorTheme(), false);
}
this._updateTheme(this._grammarFactory, this._themeService.getColorTheme(), false);
}));
// Generate some color map until the grammar registry is loaded
let colorTheme = this._themeService.getColorTheme();
let defaultForeground: Color = Color.transparent;
let defaultBackground: Color = Color.transparent;
for (let i = 0, len = colorTheme.tokenColors.length; i < len; i++) {
let rule = colorTheme.tokenColors[i];
if (!rule.scope && rule.settings) {
if (rule.settings.foreground) {
defaultForeground = Color.fromHex(rule.settings.foreground);
}
if (rule.settings.background) {
defaultBackground = Color.fromHex(rule.settings.background);
}
}
}
TokenizationRegistry.setColorMap([null!, defaultForeground, defaultBackground]);
this._languageService.onDidEncounterLanguage((languageId) => {
this._createdModes.push(languageId);
});
@@ -298,7 +280,7 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
return result;
}
private _updateTheme(grammarFactory: TMGrammarFactory, colorTheme: IWorkbenchColorTheme, forceUpdate: boolean): void {
private _updateTheme(grammarFactory: TMGrammarFactory | null, colorTheme: IWorkbenchColorTheme, forceUpdate: boolean): void {
if (!forceUpdate && this._currentTheme && this._currentTokenColorMap && AbstractTextMateService.equalsTokenRules(this._currentTheme.settings, colorTheme.tokenColors) && equalArray(this._currentTokenColorMap, colorTheme.tokenColorMap)) {
return;
}
@@ -307,8 +289,8 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
this._doUpdateTheme(grammarFactory, this._currentTheme, this._currentTokenColorMap);
}
protected _doUpdateTheme(grammarFactory: TMGrammarFactory, theme: IRawTheme, tokenColorMap: string[]): void {
grammarFactory.setTheme(theme, tokenColorMap);
protected _doUpdateTheme(grammarFactory: TMGrammarFactory | null, theme: IRawTheme, tokenColorMap: string[]): void {
grammarFactory?.setTheme(theme, tokenColorMap);
let colorMap = AbstractTextMateService._toColorMap(tokenColorMap);
let cssRules = generateTokensCSSForColorMap(colorMap);
this._styleElement.textContent = cssRules;

2
src/vs/workbench/services/textMate/browser/nativeTextMateService.ts
View File

@@ -226,7 +226,7 @@ export class TextMateService extends AbstractTextMateService {
}
}
protected override _doUpdateTheme(grammarFactory: TMGrammarFactory, theme: IRawTheme, colorMap: string[]): void {
protected override _doUpdateTheme(grammarFactory: TMGrammarFactory | null, theme: IRawTheme, colorMap: string[]): void {
super._doUpdateTheme(grammarFactory, theme, colorMap);
if (this._currentTheme && this._currentTokenColorMap && this._workerProxy) {
this._workerProxy.acceptTheme(this._currentTheme, this._currentTokenColorMap);