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

[html] make mode services async

Browse Source
This commit is contained in:
Martin Aeschlimann
2020-06-25 11:48:16 +02:00
parent f591492df8
commit a180933669
16 changed files with 322 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
extensions/html-language-features/server/src/test/semanticTokens.test.ts
View File

@@ -16,7 +16,7 @@ interface ExpectedToken {
tokenClassifiction: string;
}
function assertTokens(lines: string[], expected: ExpectedToken[], ranges?: Range[], message?: string): void {
async function assertTokens(lines: string[], expected: ExpectedToken[], ranges?: Range[], message?: string): Promise<void> {
const document = TextDocument.create('test://foo/bar.html', 'html', 1, lines.join('\n'));
const workspace = {
settings: {},
@@ -26,7 +26,7 @@ function assertTokens(lines: string[], expected: ExpectedToken[], ranges?: Range
const semanticTokensProvider = newSemanticTokenProvider(languageModes);
const legend = semanticTokensProvider.legend;
const actual = semanticTokensProvider.getSemanticTokens(document, ranges);
const actual = await semanticTokensProvider.getSemanticTokens(document, ranges);
let actualRanges = [];
let lastLine = 0;
@@ -49,7 +49,7 @@ function t(startLine: number, character: number, length: number, tokenClassifict
suite('HTML Semantic Tokens', () => {
test('Variables', () => {
test('Variables', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -64,7 +64,7 @@ suite('HTML Semantic Tokens', () => {
/*10*/'</head>',
/*11*/'</html>',
];
assertTokens(input, [
await assertTokens(input, [
t(3, 6, 1, 'variable.declaration'), t(3, 13, 2, 'variable.declaration'), t(3, 19, 1, 'variable'),
t(5, 15, 1, 'variable.declaration.readonly'), t(5, 20, 2, 'variable'), t(5, 26, 1, 'variable'), t(5, 30, 1, 'variable.readonly'),
t(6, 11, 1, 'variable.declaration'),
@@ -72,7 +72,7 @@ suite('HTML Semantic Tokens', () => {
]);
});
test('Functions', () => {
test('Functions', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -85,14 +85,14 @@ suite('HTML Semantic Tokens', () => {
/*8*/'</head>',
/*9*/'</html>',
];
assertTokens(input, [
await assertTokens(input, [
t(3, 11, 3, 'function.declaration'), t(3, 15, 2, 'parameter.declaration'),
t(4, 11, 3, 'function'), t(4, 15, 4, 'interface'), t(4, 20, 3, 'member'), t(4, 24, 2, 'parameter'),
t(6, 6, 6, 'variable'), t(6, 13, 8, 'property'), t(6, 24, 5, 'member'), t(6, 35, 7, 'member'), t(6, 43, 1, 'parameter.declaration'), t(6, 48, 3, 'function'), t(6, 52, 1, 'parameter')
]);
});
test('Members', () => {
test('Members', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -111,7 +111,7 @@ suite('HTML Semantic Tokens', () => {
];
assertTokens(input, [
await assertTokens(input, [
t(3, 8, 1, 'class.declaration'),
t(4, 11, 1, 'property.declaration.static'),
t(5, 4, 1, 'property.declaration'),
@@ -121,7 +121,7 @@ suite('HTML Semantic Tokens', () => {
]);
});
test('Interfaces', () => {
test('Interfaces', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -133,14 +133,14 @@ suite('HTML Semantic Tokens', () => {
/*7*/'</head>',
/*8*/'</html>',
];
assertTokens(input, [
await assertTokens(input, [
t(3, 12, 8, 'interface.declaration'), t(3, 23, 1, 'property.declaration'), t(3, 34, 1, 'property.declaration'),
t(4, 8, 1, 'variable.declaration.readonly'), t(4, 30, 8, 'interface'),
t(5, 8, 3, 'variable.declaration.readonly'), t(5, 15, 1, 'parameter.declaration'), t(5, 18, 8, 'interface'), t(5, 31, 1, 'parameter'), t(5, 33, 1, 'property'), t(5, 37, 1, 'parameter'), t(5, 39, 1, 'property')
]);
});
test('Readonly', () => {
test('Readonly', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -153,7 +153,7 @@ suite('HTML Semantic Tokens', () => {
/*8*/'</head>',
/*9*/'</html>',
];
assertTokens(input, [
await assertTokens(input, [
t(3, 8, 1, 'variable.declaration.readonly'),
t(4, 8, 1, 'class.declaration'), t(4, 28, 1, 'property.declaration.static.readonly'), t(4, 42, 3, 'property.declaration.static'), t(4, 47, 3, 'interface'),
t(5, 13, 1, 'enum.declaration'), t(5, 17, 1, 'property.declaration.readonly'), t(5, 24, 1, 'property.declaration.readonly'), t(5, 28, 1, 'property.readonly'),
@@ -162,7 +162,7 @@ suite('HTML Semantic Tokens', () => {
});
test('Type aliases and type parameters', () => {
test('Type aliases and type parameters', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -175,14 +175,14 @@ suite('HTML Semantic Tokens', () => {
/*8*/'</head>',
/*9*/'</html>',
];
assertTokens(input, [
await assertTokens(input, [
t(3, 7, 5, 'type.declaration'), t(3, 15, 3, 'interface') /* to investiagte */,
t(4, 11, 1, 'function.declaration'), t(4, 13, 1, 'typeParameter.declaration'), t(4, 23, 5, 'type'), t(4, 30, 1, 'parameter.declaration'), t(4, 33, 1, 'typeParameter'), t(4, 47, 1, 'typeParameter'),
t(5, 12, 1, 'typeParameter'), t(5, 29, 3, 'interface'), t(5, 41, 5, 'type'),
]);
});
test('TS and JS', () => {
test('TS and JS', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -195,13 +195,13 @@ suite('HTML Semantic Tokens', () => {
/*8*/'</head>',
/*9*/'</html>',
];
assertTokens(input, [
await assertTokens(input, [
t(3, 11, 1, 'function.declaration'), t(3, 13, 1, 'typeParameter.declaration'), t(3, 16, 2, 'parameter.declaration'), t(3, 20, 1, 'typeParameter'), t(3, 24, 1, 'typeParameter'), t(3, 39, 2, 'parameter'),
t(6, 2, 6, 'variable'), t(6, 9, 5, 'member')
]);
});
test('Ranges', () => {
test('Ranges', async () => {
const input = [
/*0*/'<html>',
/*1*/'<head>',
@@ -214,11 +214,11 @@ suite('HTML Semantic Tokens', () => {
/*8*/'</head>',
/*9*/'</html>',
];
assertTokens(input, [
await assertTokens(input, [
t(3, 2, 6, 'variable'), t(3, 9, 5, 'member')
], [Range.create(Position.create(2, 0), Position.create(4, 0))]);
assertTokens(input, [
await assertTokens(input, [
t(6, 2, 6, 'variable'),
], [Range.create(Position.create(6, 2), Position.create(6, 8))]);
});