development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-11-05 18:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

💄

Browse source
This commit is contained in:
Matt Bierner 2018-11-20 17:55:03 -08:00
parent ca7f6c2cf2
commit bab1ea6c27
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
extensions/typescript-language-features/src/utils/snippetForFunctionCall.ts
View file

@ -13,8 +13,9 @@ export function snippetForFunctionCall(
if (item.insertText && typeof item.insertText !== 'string') {
return item.insertText;
}
const snippet = new vscode.SnippetString(`${item.insertText || item.label}(`);
const parameterListParts = getParameterListParts(displayParts, item.label);
const snippet = new vscode.SnippetString(`${item.insertText || item.label}(`);
appendJoinedPlaceholders(snippet, parameterListParts.parts, ', ');
if (parameterListParts.hasOptionalParameters) {
snippet.appendTabstop();
@ -24,7 +25,7 @@ export function snippetForFunctionCall(
return snippet;
}
function appendJoinedPlaceholders(snippet: vscode.SnippetString, parts: ReadonlyArray<ParamterPart>, joiner: string) {
function appendJoinedPlaceholders(snippet: vscode.SnippetString, parts: ReadonlyArray<Proto.SymbolDisplayPart>, joiner: string) {
for (let i = 0; i < parts.length; ++i) {
const paramterPart = parts[i];
snippet.appendPlaceholder(paramterPart.text);
@ -34,21 +35,15 @@ function appendJoinedPlaceholders(snippet: vscode.SnippetString, parts: Readonly
}
}
interface ParamterPart {
readonly text: string;
readonly optional?: boolean;
}
function getParameterListParts(displayParts: ReadonlyArray<Proto.SymbolDisplayPart>, label: string): {
parts: ReadonlyArray<ParamterPart>;
parts: ReadonlyArray<Proto.SymbolDisplayPart>;
hasOptionalParameters: boolean;
} {
let parts: ParamterPart[] = [];
const parts: Proto.SymbolDisplayPart[] = [];
let isInMethod = false;
let hasOptionalParameters = false;
let parenCount = 0;
let i = 0;
for (; i < displayParts.length; ++i) {
for (let i = 0; i < displayParts.length; ++i) {
const part = displayParts[i];
if ((part.kind === 'methodName' || part.kind === 'functionName' || part.kind === 'text') && part.text === label) {
if (parenCount === 0) {