maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't add empty documentation for js/ts completions

Browse source 
Fixes #42662
This commit is contained in:
Matt Bierner 2018-01-31 11:26:04 -08:00
parent 2072302420
commit 6004de0402
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
extensions/typescript/src/features/completionItemProvider.ts
View file

@ -375,10 +375,34 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
}
const detail = details[0];
item.detail = detail.displayParts.length ? Previewer.plain(detail.displayParts) : undefined;
item.documentation = this.getDocumentation(detail, item);
if (detail.codeActions && detail.codeActions.length) {
item.command = {
title: '',
command: ApplyCompletionCodeActionCommand.ID,
arguments: [filepath, detail.codeActions]
};
}
if (detail && item.useCodeSnippet) {
const shouldCompleteFunction = await this.isValidFunctionCompletionContext(filepath, item.position);
if (shouldCompleteFunction) {
item.insertText = this.snippetForFunctionCall(item, detail);
}
return item;
}
return item;
}
private getDocumentation(
detail: Proto.CompletionEntryDetails,
item: MyCompletionItem
): MarkdownString | undefined {
const documentation = new MarkdownString();
if (detail.source) {
let importPath = `'${Previewer.plain(detail.source)}'`;
if (this.client.apiVersion.has260Features() && !this.client.apiVersion.has262Features()) {
// Try to resolve the real import name that will be added
if (detail.codeActions && detail.codeActions[0]) {
@ -399,27 +423,9 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
}
documentation.appendMarkdown('\n\n');
}
Previewer.addMarkdownDocumentation(documentation, detail.documentation, detail.tags);
item.documentation = documentation;
if (detail.codeActions && detail.codeActions.length) {
item.command = {
title: '',
command: ApplyCompletionCodeActionCommand.ID,
arguments: [filepath, detail.codeActions]
};
}
if (detail && item.useCodeSnippet) {
const shouldCompleteFunction = await this.isValidFunctionCompletionContext(filepath, item.position);
if (shouldCompleteFunction) {
item.insertText = this.snippetForFunctionCall(item, detail);
}
return item;
}
return item;
return documentation.value.length ? documentation : undefined;
}
private async isValidFunctionCompletionContext(filepath: string, position: Position): Promise<boolean> {