diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts
index 69ebff04443..471490a5f9f 100644
--- a/extensions/html-language-features/server/src/test/completions.test.ts
+++ b/extensions/html-language-features/server/src/test/completions.test.ts
@@ -7,7 +7,7 @@
import 'mocha';
import * as assert from 'assert';
import * as path from 'path';
-import Uri from 'vscode-uri';
+// import Uri from 'vscode-uri';
import { TextDocument, CompletionList, CompletionItemKind } from 'vscode-languageserver-types';
import { getLanguageModes } from '../modes/languageModes';
import { getPathCompletionParticipant } from '../modes/pathCompletion';
@@ -18,117 +18,224 @@ export interface ItemDescription {
documentation?: string;
kind?: CompletionItemKind;
resultText?: string;
+ command?: { title: string, command: string };
notAvailable?: boolean;
}
-
-suite('HTML Completions', () => {
-
- let assertCompletion = function (completions: CompletionList, expected: ItemDescription, document: TextDocument, offset: number) {
- let matches = completions.items.filter(completion => {
- return completion.label === expected.label;
- });
- if (expected.notAvailable) {
- assert.equal(matches.length, 0, `${expected.label} should not existing is results`);
- return;
- }
-
- assert.equal(matches.length, 1, `${expected.label} should only existing once: Actual: ${completions.items.map(c => c.label).join(', ')}`);
- let match = matches[0];
- if (expected.documentation) {
- assert.equal(match.documentation, expected.documentation);
- }
- if (expected.kind) {
- assert.equal(match.kind, expected.kind);
- }
- if (expected.resultText && match.textEdit) {
- assert.equal(TextDocument.applyEdits(document, [match.textEdit]), expected.resultText);
- }
- };
-
- const testUri = 'test://test/test.html';
-
- function assertCompletions(value: string, expected: { count?: number, items?: ItemDescription[] }, uri = testUri, workspaceFolders?: WorkspaceFolder[]): void {
- let offset = value.indexOf('|');
- value = value.substr(0, offset) + value.substr(offset + 1);
-
- let document = TextDocument.create(uri, 'html', 0, value);
- let position = document.positionAt(offset);
-
- var languageModes = getLanguageModes({ css: true, javascript: true });
- var mode = languageModes.getModeAtPosition(document, position)!;
-
- if (!workspaceFolders) {
- workspaceFolders = [{ name: 'x', uri: path.dirname(uri) }];
- }
-
- let participantResult = CompletionList.create([]);
- if (mode.setCompletionParticipants) {
- mode.setCompletionParticipants([getPathCompletionParticipant(document, workspaceFolders, participantResult)]);
- }
-
- let list = mode.doComplete!(document, position)!;
- list.items = list.items.concat(participantResult.items);
-
- if (expected.count) {
- assert.equal(list.items, expected.count);
- }
- if (expected.items) {
- for (let item of expected.items) {
- assertCompletion(list, item, document, offset);
- }
- }
+export function assertCompletion (completions: CompletionList, expected: ItemDescription, document: TextDocument, offset: number) {
+ let matches = completions.items.filter(completion => {
+ return completion.label === expected.label;
+ });
+ if (expected.notAvailable) {
+ assert.equal(matches.length, 0, `${expected.label} should not existing is results`);
+ return;
}
+ assert.equal(matches.length, 1, `${expected.label} should only existing once: Actual: ${completions.items.map(c => c.label).join(', ')}`);
+ let match = matches[0];
+ if (expected.documentation) {
+ assert.equal(match.documentation, expected.documentation);
+ }
+ if (expected.kind) {
+ assert.equal(match.kind, expected.kind);
+ }
+ if (expected.resultText && match.textEdit) {
+ assert.equal(TextDocument.applyEdits(document, [match.textEdit]), expected.resultText);
+ }
+ if (expected.command) {
+ assert.deepEqual(match.command, expected.command);
+ }
+}
+
+const testUri = 'test://test/test.html';
+
+export function testCompletionFor(
+ value: string,
+ expected: { count?: number, items?: ItemDescription[] },
+ uri = testUri,
+ workspaceFolders?: WorkspaceFolder[]
+): void {
+ let offset = value.indexOf('|');
+ value = value.substr(0, offset) + value.substr(offset + 1);
+
+ let document = TextDocument.create(uri, 'html', 0, value);
+ let position = document.positionAt(offset);
+
+ var languageModes = getLanguageModes({ css: true, javascript: true });
+ var mode = languageModes.getModeAtPosition(document, position)!;
+
+ if (!workspaceFolders) {
+ workspaceFolders = [{ name: 'x', uri: path.dirname(uri) }];
+ }
+
+ let participantResult = CompletionList.create([]);
+ if (mode.setCompletionParticipants) {
+ mode.setCompletionParticipants([getPathCompletionParticipant(document, workspaceFolders, participantResult)]);
+ }
+
+ let list = mode.doComplete!(document, position)!;
+ list.items = list.items.concat(participantResult.items);
+
+ if (expected.count) {
+ assert.equal(list.items, expected.count);
+ }
+ if (expected.items) {
+ for (let item of expected.items) {
+ assertCompletion(list, item, document, offset);
+ }
+ }
+}
+
+suite('HTML Completion', () => {
test('HTML Javascript Completions', function (): any {
- assertCompletions('', {
+ testCompletionFor('', {
items: [
{ label: 'location', resultText: '' },
]
});
- assertCompletions('', {
+ testCompletionFor('', {
items: [
{ label: 'getJSON', resultText: '' },
]
});
});
+});
- test('Path completion', function (): any {
- let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/foo.html')).fsPath;
+suite('HTML Path Completion', () => {
+ const triggerSuggestCommand = {
+ title: 'Suggest',
+ command: 'editor.action.triggerSuggest'
+ };
- assertCompletions('