Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add LanguageService as facade

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-06-13 11:29:35 +02:00
parent 3c1503a29c
commit 5dfa0e0350
8 changed files with 160 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/css/server/src/test/completion.test.ts
View File

@@ -36,7 +36,7 @@ suite('CSS - Completion', () => {
}
};
let testCompletionFor = function (value: string, stringBefore: string, expected: { count?: number, items?: ItemDescription[] }): Thenable<CompletionList> {
let testCompletionFor = function (value: string, stringBefore: string, expected: { count?: number, items?: ItemDescription[] }): Thenable<void> {
let idx = stringBefore ? value.indexOf(stringBefore) + stringBefore.length : 0;
let completionProvider = new CSSCompletion();
@@ -44,16 +44,16 @@ suite('CSS - Completion', () => {
let document = TextDocument.create('test://test/test.css', 'css', 0, value);
let position = Position.create(0, idx);
let jsonDoc = new Parser().parseStylesheet(document);
let list = completionProvider.doComplete(document, position, jsonDoc);
if (expected.count) {
assert.equal(list.items, expected.count);
}
if (expected.items) {
for (let item of expected.items) {
assertCompletion(list, item, document);
return completionProvider.doComplete(document, position, jsonDoc).then(list => {
if (expected.count) {
assert.equal(list.items, expected.count);
}
}
return Promise.resolve(null);
if (expected.items) {
for (let item of expected.items) {
assertCompletion(list, item, document);
}
}
});
};
test('sylesheet', function (testDone): any {

69
extensions/css/server/src/test/navigation.test.ts
View File

@@ -17,7 +17,7 @@ export function assertScopesAndSymbols(p: Parser, input: string, expected: strin
assert.equal(scopeToString(global), expected);
}
export function assertHighlights(p: Parser, input: string, marker: string, expectedMatches: number, expectedWrites: number): void {
export function assertHighlights(p: Parser, input: string, marker: string, expectedMatches: number, expectedWrites: number): Thenable<void> {
let document = TextDocument.create('test://test/test.css', 'css', 0, input);
let stylesheet = p.parseStylesheet(document);
@@ -26,19 +26,20 @@ export function assertHighlights(p: Parser, input: string, marker: string, expec
let index = input.indexOf(marker) + marker.length;
let position = document.positionAt(index);
let highlights = new CSSNavigation().findDocumentHighlights(document, position, stylesheet);
assert.equal(highlights.length, expectedMatches);
return new CSSNavigation().findDocumentHighlights(document, position, stylesheet).then(highlights => {
assert.equal(highlights.length, expectedMatches);
let nWrites = 0;
for (let highlight of highlights) {
if (highlight.kind === DocumentHighlightKind.Write) {
nWrites++;
let nWrites = 0;
for (let highlight of highlights) {
if (highlight.kind === DocumentHighlightKind.Write) {
nWrites++;
}
let range = highlight.range;
let start = document.offsetAt(range.start), end = document.offsetAt(range.end);
assert.equal(document.getText().substring(start, end), marker);
}
let range = highlight.range;
let start = document.offsetAt(range.start), end = document.offsetAt(range.end);
assert.equal(document.getText().substring(start, end), marker);
}
assert.equal(nWrites, expectedWrites);
assert.equal(nWrites, expectedWrites);
});
}
@@ -169,10 +170,12 @@ suite('CSS - Symbols', () => {
assertScopesAndSymbols(p, '@font-face { font-family: "Bitstream Vera Serif Bold"; }', '[]');
});
test('mark occurrences', function () {
test('mark occurrences', function (testDone) {
let p = new Parser();
assertHighlights(p, '@keyframes id {}; #main { animation: id 4s linear 0s infinite alternate; }', 'id', 2, 1);
assertHighlights(p, '@keyframes id {}; #main { animation-name: id; foo: id;}', 'id', 2, 1);
Promise.all([
assertHighlights(p, '@keyframes id {}; #main { animation: id 4s linear 0s infinite alternate; }', 'id', 2, 1),
assertHighlights(p, '@keyframes id {}; #main { animation-name: id; foo: id;}', 'id', 2, 1)
]).then(() => testDone(), (error) => testDone(error));
});
test('test variables in root scope', function () {
@@ -195,33 +198,45 @@ suite('CSS - Symbols', () => {
assertSymbolsInScope(p, '.a{ --var1: abc; } .b{ --var2: abc; } :root{ --var3: abc;}', 2, { name: '--var1', type: nodes.ReferenceType.Variable }, { name: '--var2', type: nodes.ReferenceType.Variable }, { name: '--var3', type: nodes.ReferenceType.Variable });
});
test('mark occurrences for variable defined in root and used in a rule', function () {
test('mark occurrences for variable defined in root and used in a rule', function (testDone) {
let p = new Parser();
assertHighlights(p, '.a{ background: let(--var1); } :root{ --var1: abc;}', '--var1', 2, 1);
Promise.all([
assertHighlights(p, '.a{ background: let(--var1); } :root{ --var1: abc;}', '--var1', 2, 1)
]).then(() => testDone(), (error) => testDone(error));
});
test('mark occurrences for variable defined in a rule and used in a different rule', function () {
test('mark occurrences for variable defined in a rule and used in a different rule', function (testDone) {
let p = new Parser();
assertHighlights(p, '.a{ background: let(--var1); } :b{ --var1: abc;}', '--var1', 2, 1);
Promise.all([
assertHighlights(p, '.a{ background: let(--var1); } :b{ --var1: abc;}', '--var1', 2, 1)
]).then(() => testDone(), (error) => testDone(error));
});
test('mark occurrences for property', function () {
test('mark occurrences for property', function (testDone) {
let p = new Parser();
assertHighlights(p, 'body { display: inline } #foo { display: inline }', 'display', 2, 0);
Promise.all([
assertHighlights(p, 'body { display: inline } #foo { display: inline }', 'display', 2, 0)
]).then(() => testDone(), (error) => testDone(error));
});
test('mark occurrences for value', function () {
test('mark occurrences for value', function (testDone) {
let p = new Parser();
assertHighlights(p, 'body { display: inline } #foo { display: inline }', 'inline', 2, 0);
Promise.all([
assertHighlights(p, 'body { display: inline } #foo { display: inline }', 'inline', 2, 0)
]).then(() => testDone(), (error) => testDone(error));
});
test('mark occurrences for selector', function () {
test('mark occurrences for selector', function (testDone) {
let p = new Parser();
assertHighlights(p, 'body { display: inline } #foo { display: inline }', 'body', 1, 1);
Promise.all([
assertHighlights(p, 'body { display: inline } #foo { display: inline }', 'body', 1, 1)
]).then(() => testDone(), (error) => testDone(error));
});
test('mark occurrences for comment', function () {
test('mark occurrences for comment', function (testDone) {
let p = new Parser();
assertHighlights(p, '/* comment */body { display: inline } ', 'comment', 0, 0);
Promise.all([
assertHighlights(p, '/* comment */body { display: inline } ', 'comment', 0, 0)
]).then(() => testDone(), (error) => testDone(error));
});
});