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

basic completion

Browse Source
This commit is contained in:
Pine Wu
2018-02-21 07:58:38 -08:00
parent 2fee5d4fc2
commit 9a0b59c55b
3 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/html/server/src/htmlServerMain.ts
View File

@@ -18,6 +18,7 @@ import { getDocumentContext } from './utils/documentContext';
import uri from 'vscode-uri';
import { formatError, runSafe } from './utils/errors';
import { doComplete as emmetDoComplete, updateExtensionsPath as updateEmmetExtensionsPath, getEmmetCompletionParticipants } from 'vscode-emmet-helper';
import { getPathCompletionParticipant } from './modes/pathCompletion';
namespace TagCloseRequest {
export const type: RequestType<TextDocumentPositionParams, string | null, any, any> = new RequestType('html/tag');
@@ -272,9 +273,16 @@ connection.onCompletion(async textDocumentPosition => {
isIncomplete: true,
items: undefined
};
let pathCompletionList: CompletionList = {
isIncomplete: false,
items: undefined
};
if (mode.setCompletionParticipants) {
const emmetCompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, mode.getId(), emmetSettings, emmetCompletionList);
mode.setCompletionParticipants([emmetCompletionParticipant]);
const pathCompletionParticipant = getPathCompletionParticipant(document, textDocumentPosition.position, pathCompletionList, workspaceFolders);
mode.setCompletionParticipants([emmetCompletionParticipant, pathCompletionParticipant]);
}
let settings = await getDocumentSettings(document, () => mode.doComplete.length > 2);
@@ -284,9 +292,9 @@ connection.onCompletion(async textDocumentPosition => {
if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
emmetCompletionList.items.shift();
}
return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] };
return { isIncomplete: true, items: [...emmetCompletionList.items, ...pathCompletionList.items, ...result.items] };
}
return result;
return { isIncomplete: false, items: [...pathCompletionList.items, ...result.items] };
}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`);
});