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

Handle invalid token type/modifier indexes. Fixes #96540

Browse Source
This commit is contained in:
Martin Aeschlimann
2020-05-01 16:48:19 +02:00
parent ddff80b3e6
commit fe5024cb35
4 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/vscode-colorize-tests/src/colorizerTestMain.ts
View File

@@ -22,24 +22,31 @@ export function activate(context: vscode.ExtensionContext): any {
function addToken(value: string, startLine: number, startCharacter: number, length: number) {
const [type, ...modifiers] = value.split('.');
const selectedModifiers = [];
let tokenType = legend.tokenTypes.indexOf(type);
if (tokenType === -1) {
return;
}
let tokenModifiers = 0;
for (let i = 0; i < modifiers.length; i++) {
const index = legend.tokenModifiers.indexOf(modifiers[i]);
if (index !== -1) {
tokenModifiers = tokenModifiers | 1 << index;
if (type === 'notInLegend') {
tokenType = tokenTypes.length + 2;
} else {
return;
}
}
let tokenModifiers = 0;
for (const modifier of modifiers) {
const index = legend.tokenModifiers.indexOf(modifier);
if (index !== -1) {
tokenModifiers = tokenModifiers | 1 << index;
selectedModifiers.push(modifier);
} else if (modifier === 'notInLegend') {
tokenModifiers = tokenModifiers | 1 << (legend.tokenModifiers.length + 2);
selectedModifiers.push(modifier);
}
}
builder.push(startLine, startCharacter, length, tokenType, tokenModifiers);
const selectedModifiers = legend.tokenModifiers.filter((_val, bit) => tokenModifiers & (1 << bit)).join(' ');
outputChannel.appendLine(`line: ${startLine}, character: ${startCharacter}, length ${length}, ${legend.tokenTypes[tokenType]} (${tokenType}), ${selectedModifiers} ${tokenModifiers.toString(2)}`);
outputChannel.appendLine(`line: ${startLine}, character: ${startCharacter}, length ${length}, ${type} (${tokenType}), ${selectedModifiers} ${tokenModifiers.toString(2)}`);
}
outputChannel.appendLine('---');