Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-23 19:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move snippetForFunctionCall to own file

Browse Source
This commit is contained in:
Matt Bierner
2018-11-20 17:52:03 -08:00
parent 77454b24bc
commit ca7f6c2cf2
3 changed files with 86 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
extensions/typescript-language-features/src/features/completions.ts
View File

@@ -18,6 +18,7 @@ import * as Previewer from '../utils/previewer';
import * as typeConverters from '../utils/typeConverters';
import TypingsStatus from '../utils/typingsStatus';
import FileConfigurationManager from './fileConfigurationManager';
import { snippetForFunctionCall } from '../utils/snippetForFunctionCall';
const localize = nls.loadMessageBundle();
@@ -624,92 +625,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider
}
}
export function snippetForFunctionCall(
item: { insertText?: string | vscode.SnippetString, label: string },
displayParts: ReadonlyArray<Proto.SymbolDisplayPart>
): vscode.SnippetString {
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);
appendJoinedPlaceholders(snippet, parameterListParts.parts, ', ');
if (parameterListParts.hasOptionalParameters) {
snippet.appendTabstop();
}
snippet.appendText(')');
snippet.appendTabstop(0);
return snippet;
}
function appendJoinedPlaceholders(
snippet: vscode.SnippetString,
parts: ReadonlyArray<ParamterPart>,
joiner: string
) {
for (let i = 0; i < parts.length; ++i) {
const paramterPart = parts[i];
snippet.appendPlaceholder(paramterPart.text);
if (i !== parts.length - 1) {
snippet.appendText(joiner);
}
}
}
interface ParamterPart {
readonly text: string;
readonly optional?: boolean;
}
function getParameterListParts(
displayParts: ReadonlyArray<Proto.SymbolDisplayPart>,
label: string,
): {
parts: ReadonlyArray<ParamterPart>
hasOptionalParameters: boolean
} {
let parts: ParamterPart[] = [];
let isInMethod = false;
let hasOptionalParameters = false;
let parenCount = 0;
let i = 0;
for (; i < displayParts.length; ++i) {
const part = displayParts[i];
if ((part.kind === 'methodName' || part.kind === 'functionName' || part.kind === 'text') && part.text === label) {
if (parenCount === 0) {
isInMethod = true;
}
} if (part.kind === 'parameterName' && parenCount === 1 && isInMethod) {
// Only take top level paren names
const next = displayParts[i + 1];
// Skip optional parameters
const nameIsFollowedByOptionalIndicator = next && next.text === '?';
if (!nameIsFollowedByOptionalIndicator) {
parts.push(part);
}
hasOptionalParameters = hasOptionalParameters || nameIsFollowedByOptionalIndicator;
} else if (part.kind === 'punctuation') {
if (part.text === '(') {
++parenCount;
} else if (part.text === ')') {
--parenCount;
if (parenCount <= 0 && isInMethod) {
break;
}
} else if (part.text === '...' && parenCount === 1) {
// Found rest parmeter. Do not fill in any further arguments
hasOptionalParameters = true;
break;
}
}
}
return { hasOptionalParameters, parts };
}
function shouldExcludeCompletionEntry(
element: Proto.CompletionEntry,
completionConfiguration: CompletionConfiguration

2
extensions/typescript-language-features/src/test/functionCallSnippet.test.ts
View File

@@ -6,7 +6,7 @@
import * as assert from 'assert';
import 'mocha';
import * as vscode from 'vscode';
import { snippetForFunctionCall } from '../features/completions';
import { snippetForFunctionCall } from "../utils/snippetForFunctionCall";
suite('typescript function call snippets', () => {
test('Should use label as function name', async () => {

84
extensions/typescript-language-features/src/utils/snippetForFunctionCall.ts Normal file
View File

@@ -0,0 +1,84 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
import * as Proto from '../protocol';
export function snippetForFunctionCall(
item: { insertText?: string | vscode.SnippetString; label: string; },
displayParts: ReadonlyArray<Proto.SymbolDisplayPart>
): vscode.SnippetString {
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);
appendJoinedPlaceholders(snippet, parameterListParts.parts, ', ');
if (parameterListParts.hasOptionalParameters) {
snippet.appendTabstop();
}
snippet.appendText(')');
snippet.appendTabstop(0);
return snippet;
}
function appendJoinedPlaceholders(snippet: vscode.SnippetString, parts: ReadonlyArray<ParamterPart>, joiner: string) {
for (let i = 0; i < parts.length; ++i) {
const paramterPart = parts[i];
snippet.appendPlaceholder(paramterPart.text);
if (i !== parts.length - 1) {
snippet.appendText(joiner);
}
}
}
interface ParamterPart {
readonly text: string;
readonly optional?: boolean;
}
function getParameterListParts(displayParts: ReadonlyArray<Proto.SymbolDisplayPart>, label: string): {
parts: ReadonlyArray<ParamterPart>;
hasOptionalParameters: boolean;
} {
let parts: ParamterPart[] = [];
let isInMethod = false;
let hasOptionalParameters = false;
let parenCount = 0;
let i = 0;
for (; i < displayParts.length; ++i) {
const part = displayParts[i];
if ((part.kind === 'methodName' || part.kind === 'functionName' || part.kind === 'text') && part.text === label) {
if (parenCount === 0) {
isInMethod = true;
}
}
if (part.kind === 'parameterName' && parenCount === 1 && isInMethod) {
// Only take top level paren names
const next = displayParts[i + 1];
// Skip optional parameters
const nameIsFollowedByOptionalIndicator = next && next.text === '?';
if (!nameIsFollowedByOptionalIndicator) {
parts.push(part);
}
hasOptionalParameters = hasOptionalParameters || nameIsFollowedByOptionalIndicator;
}
else if (part.kind === 'punctuation') {
if (part.text === '(') {
++parenCount;
} else if (part.text === ')') {
--parenCount;
if (parenCount <= 0 && isInMethod) {
break;
}
} else if (part.text === '...' && parenCount === 1) {
// Found rest parmeter. Do not fill in any further arguments
hasOptionalParameters = true;
break;
}
}
}
return { hasOptionalParameters, parts };
}