development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid running pathCompletion in languages other than html

Browse source
This commit is contained in:
Pine Wu 2018-02-26 16:30:29 -08:00
parent b34585bc6d
commit 5a67acfb17
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extensions/html/server/src/htmlServerMain.ts
View file

@ -288,7 +288,13 @@ connection.onCompletion(async textDocumentPosition => {
const emmetCompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, mode.getId(), emmetSettings, emmetCompletionList);
const pathCompletionParticipant = getPathCompletionParticipant(document, workspaceFolders, pathCompletionList);
mode.setCompletionParticipants([emmetCompletionParticipant, pathCompletionParticipant]);
// Ideally, fix this in the Language Service side
// Check participants' methods before calling them
if (mode.getId() === 'html') {
mode.setCompletionParticipants([emmetCompletionParticipant, pathCompletionParticipant]);
} else {
mode.setCompletionParticipants([emmetCompletionParticipant]);
}
}
let settings = await getDocumentSettings(document, () => mode.doComplete.length > 2);
@ -405,8 +411,6 @@ connection.onDocumentLinks(documentLinkParam => {
}, [], `Error while document links for ${documentLinkParam.textDocument.uri}`);
});
connection.onDocumentSymbol(documentSymbolParms => {
return runSafe(() => {
let document = documents.get(documentSymbolParms.textDocument.uri);