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

Merge branch 'master' into ben/notifications

Browse Source
This commit is contained in:
Benjamin Pasero
2018-02-18 11:14:26 +01:00
parent a0515f04b1 ad06c9c609
commit 18c60de96e
162 changed files with 1587 additions and 1436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/typescript/src/features/completionItemProvider.ts
View File

@@ -464,7 +464,8 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
let hasAddedParameters = false;
const snippet = new SnippetString();
snippet.appendText(item.label || item.insertText as string);
const methodName = detail.displayParts.find(part => part.kind === 'methodName');
snippet.appendText((methodName && methodName.text) || item.label || item.insertText as string);
snippet.appendText('(');
let parenCount = 0;

6
extensions/typescript/src/features/jsDocCompletionProvider.ts
View File

@@ -170,6 +170,12 @@ class TryCompleteJsDocCommand implements Command {
if (!res || !res.body) {
return undefined;
}
// Workaround for #43619
// docCommentTemplate previously returned undefined for empty jsdoc templates.
// TS 2.7 now returns a single line doc comment, which breaks indentation.
if (res.body.newText === '/** */') {
return undefined;
}
return TryCompleteJsDocCommand.templateToSnippet(res.body.newText);
}, () => undefined);
}