Skip to content

Commit

Permalink
feat: let TokenSelector support multi-languages
Browse files Browse the repository at this point in the history
  • Loading branch information
@Colibrow
Colibrow committed Feb 22, 2025
1 parent 0b111a9 commit a2870fc
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
24 changes: 12 additions & 12 deletions src/vs/platform/theme/common/tokenClassificationRegistry.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ type TokenClassificationString = string;
const idPattern = '\\w+[-_\\w+]*';
export const typeAndModifierIdPattern = `^${idPattern}$`;

const selectorPattern = `^(${idPattern}|\\*)(\\${CLASSIFIER_MODIFIER_SEPARATOR}${idPattern})*(${TOKEN_CLASSIFIER_LANGUAGE_SEPARATOR}${idPattern})?$`;
const selectorPattern = `^(${idPattern}|\\*)(\\${CLASSIFIER_MODIFIER_SEPARATOR}${idPattern})*(${TOKEN_CLASSIFIER_LANGUAGE_SEPARATOR}${idPattern}(,${idPattern})*)?$`;

const fontStylePattern = '^(\\s*(italic|bold|underline|strikethrough))*\\s*$';

export interface TokenSelector {
match(type: string, modifiers: string[], language: string): number;
match(type: string, modifiers: string[], languages: string[]): number;
readonly id: string;
}

Expand Down Expand Up @@ -393,10 +393,10 @@ class TokenClassificationRegistry implements ITokenClassificationRegistry {
}

return {
match: (type: string, modifiers: string[], language: string) => {
match: (type: string, modifiers: string[], languages: string[]) => {
let score = 0;
if (selector.language !== undefined) {
if (selector.language !== language) {
if (selector.languages !== undefined) {
if (!selector.languages.some(l => languages.includes(l))) {
return -1;
}
score += 10;
Expand All @@ -417,7 +417,7 @@ class TokenClassificationRegistry implements ITokenClassificationRegistry {
}
return score + selector.modifiers.length * 100;
},
id: `${[selector.type, ...selector.modifiers.sort()].join('.')}${selector.language !== undefined ? ':' + selector.language : ''}`
id: `${[selector.type, ...selector.modifiers.sort()].join('.')}${selector.languages !== undefined ? ':' + selector.languages.sort().join(',') : ''}`
};
}

Expand Down Expand Up @@ -489,11 +489,11 @@ class TokenClassificationRegistry implements ITokenClassificationRegistry {
const CHAR_LANGUAGE = TOKEN_CLASSIFIER_LANGUAGE_SEPARATOR.charCodeAt(0);
const CHAR_MODIFIER = CLASSIFIER_MODIFIER_SEPARATOR.charCodeAt(0);

export function parseClassifierString(s: string, defaultLanguage: string): { type: string; modifiers: string[]; language: string };
export function parseClassifierString(s: string, defaultLanguage?: string): { type: string; modifiers: string[]; language: string | undefined };
export function parseClassifierString(s: string, defaultLanguage: string | undefined): { type: string; modifiers: string[]; language: string | undefined } {
export function parseClassifierString(s: string, defaultLanguage: string): { type: string; modifiers: string[]; languages: string[] };
export function parseClassifierString(s: string, defaultLanguage?: string): { type: string; modifiers: string[]; languages: string[] | undefined };
export function parseClassifierString(s: string, defaultLanguage: string | undefined): { type: string; modifiers: string[]; languages: string[] | undefined } {
let k = s.length;
let language: string | undefined = defaultLanguage;
let languages: string[] | undefined = defaultLanguage ? [defaultLanguage] : undefined;
const modifiers = [];

for (let i = k - 1; i >= 0; i--) {
Expand All @@ -502,14 +502,14 @@ export function parseClassifierString(s: string, defaultLanguage: string | undef
const segment = s.substring(i + 1, k);
k = i;
if (ch === CHAR_LANGUAGE) {
language = segment;
languages = segment.split(',').map(l => l.trim()).filter(l => l.length > 0);
} else {
modifiers.push(segment);
}
}
}
const type = s.substring(0, k);
return { type, modifiers, language };
return { type, modifiers, languages };
}


Expand Down
14 changes: 7 additions & 7 deletions src/vs/workbench/services/themes/common/colorThemeData.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
return undefined;
}

private getTokenStyle(type: string, modifiers: string[], language: string, useDefault = true, definitions: TokenStyleDefinitions = {}): TokenStyle | undefined {
private getTokenStyle(type: string, modifiers: string[], languages: string[], useDefault = true, definitions: TokenStyleDefinitions = {}): TokenStyle | undefined {
const result: any = {
foreground: undefined,
bold: undefined,
Expand Down Expand Up @@ -189,7 +189,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
}
}
function _processSemanticTokenRule(rule: SemanticTokenRule) {
const matchScore = rule.selector.match(type, modifiers, language);
const matchScore = rule.selector.match(type, modifiers, languages);
if (matchScore >= 0) {
_processStyle(matchScore, rule.style, rule);
}
Expand All @@ -209,7 +209,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
}
if (hasUndefinedStyleProperty) {
for (const rule of tokenClassificationRegistry.getTokenStylingDefaultRules()) {
const matchScore = rule.selector.match(type, modifiers, language);
const matchScore = rule.selector.match(type, modifiers, languages);
if (matchScore >= 0) {
let style: TokenStyle | undefined;
if (rule.defaults.scopesToProbe) {
Expand Down Expand Up @@ -239,8 +239,8 @@ export class ColorThemeData implements IWorkbenchColorTheme {
if (tokenStyleValue === undefined) {
return undefined;
} else if (typeof tokenStyleValue === 'string') {
const { type, modifiers, language } = parseClassifierString(tokenStyleValue, '');
return this.getTokenStyle(type, modifiers, language);
const { type, modifiers, languages } = parseClassifierString(tokenStyleValue, '');
return this.getTokenStyle(type, modifiers, languages);
} else if (typeof tokenStyleValue === 'object') {
return tokenStyleValue;
}
Expand Down Expand Up @@ -275,8 +275,8 @@ export class ColorThemeData implements IWorkbenchColorTheme {
}

public getTokenStyleMetadata(typeWithLanguage: string, modifiers: string[], defaultLanguage: string, useDefault = true, definitions: TokenStyleDefinitions = {}): ITokenStyle | undefined {
const { type, language } = parseClassifierString(typeWithLanguage, defaultLanguage);
const style = this.getTokenStyle(type, modifiers, language, useDefault, definitions);
const { type, languages } = parseClassifierString(typeWithLanguage, defaultLanguage);
const style = this.getTokenStyle(type, modifiers, languages, useDefault, definitions);
if (!style) {
return undefined;
}
Expand Down

0 comments on commit a2870fc

Please sign in to comment.