microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-25 16:07:52 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Add tests and fix rest parameters

Browse Source
This commit is contained in:
Arthur Ozga
2016-12-08 18:34:35 -08:00
parent 97b3d7a9ef
commit 819a654bb3
6 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/services/codefixes/helpers.ts
View File

@@ -114,18 +114,29 @@ namespace ts.codefix {
newSignatureDeclaration.parameters = createNodeArray<ParameterDeclaration>();
for (let i = 0; i < maxArgs - 1; i++) {
const newParameter = createParameterDeclaration(i, minArgumentCount, newSignatureDeclaration);
const newParameter = createParameterDeclaration(i, minArgumentCount, anyTypeNode, newSignatureDeclaration);
newSignatureDeclaration.parameters.push(newParameter);
}
const lastParameter = createParameterDeclaration(maxArgs - 1, minArgumentCount, newSignatureDeclaration);
let lastParameter: ParameterDeclaration;
if (hasRestParameter) {
lastParameter.dotDotDotToken = createToken(SyntaxKind.DotDotDotToken);
const anyArrayTypeNode = createNode(SyntaxKind.ArrayType) as ArrayTypeNode;
anyArrayTypeNode.elementType = anyTypeNode;
if (!allMaxArgsAreRest) {
const newParameter = createParameterDeclaration(maxArgs - 1, minArgumentCount, newSignatureDeclaration);
const newParameter = createParameterDeclaration(maxArgs - 1, minArgumentCount, anyTypeNode, newSignatureDeclaration);
newSignatureDeclaration.parameters.push(newParameter);
lastParameter = createParameterDeclaration(maxArgs, minArgumentCount, anyArrayTypeNode, newSignatureDeclaration);
}
else {
lastParameter = createParameterDeclaration(maxArgs - 1, minArgumentCount, anyArrayTypeNode, newSignatureDeclaration);
}
lastParameter.dotDotDotToken = createToken(SyntaxKind.DotDotDotToken);
}
else {
lastParameter = createParameterDeclaration(maxArgs - 1, minArgumentCount, anyTypeNode, newSignatureDeclaration);
}
newSignatureDeclaration.parameters.push(lastParameter);
@@ -135,12 +146,12 @@ namespace ts.codefix {
return checker.getSignatureFromDeclaration(newSignatureDeclaration);
function createParameterDeclaration(index: number, minArgCount: number, enclosingSignatureDeclaration: SignatureDeclaration): ParameterDeclaration {
function createParameterDeclaration(index: number, minArgCount: number, typeNode: TypeNode, enclosingSignatureDeclaration: SignatureDeclaration): ParameterDeclaration {
const newParameter = createNode(SyntaxKind.Parameter) as ParameterDeclaration;
newParameter.symbol = checker.createSymbol(SymbolFlags.FunctionScopedVariable, "arg" + index);
newParameter.symbol.valueDeclaration = newParameter;
newParameter.symbol.declarations = [newParameter];
newParameter.type = anyTypeNode;
newParameter.type = typeNode;
newParameter.parent = enclosingSignatureDeclaration;
if (index >= minArgCount) {
newParameter.questionToken = optionalToken;

13
tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethod.ts
View File

@@ -1,13 +0,0 @@
/// <reference path='fourslash.ts' />
//// interface I {
//// f1();
//// }
////
//// class C implements I {[|
//// |]}
verify.rangeAfterCodeFix(`f1(){
throw new Error('Method not implemented.');
}
`);

4
tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethodWithParams.ts
View File

@@ -1,14 +1,14 @@
/// <reference path='fourslash.ts' />
//// interface I {
//// f(x: number, y: string)
//// f(x: number, y: string): I
//// }
////
//// class C implements I {[|
//// |]}
verify.rangeAfterCodeFix(`
f(x: number,y: string){
f(x: number,y: string): I {
throw new Error('Method not implemented.');
}
`);

13
tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethodWithReturnType.ts
View File

@@ -1,13 +0,0 @@
/// <reference path='fourslash.ts' />
//// interface I {
//// f1(): string;
//// }
////
//// class C implements I {[|
//// |]}
verify.rangeAfterCodeFix(`f1(): string {
throw new Error('Method not implemented.');
}
`);

18
tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest1.ts Normal file
View File

@@ -0,0 +1,18 @@
/// <reference path='fourslash.ts' />
//// interface I {
//// method(a: number, ...b: string[]): boolean;
//// method(a: string, ...b: number[]): Function;
//// method(a: string): Function;
//// }
////
//// class C implements I {[| |]}
verify.rangeAfterCodeFix(`
method(a: number, ...b: string[]): boolean;
method(a: string, ...b: number[]): Function;
method(a: string): Function;
method(arg0: any, ...arg1?: any[]) {
throw new Error('Method not implemented.');
}
`);

18
tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest2.ts Normal file
View File

@@ -0,0 +1,18 @@
/// <reference path='fourslash.ts' />
//// interface I {
//// method(a: number, ...b: string[]): boolean;
//// method(a: string, b: number): Function;
//// method(a: string): Function;
//// }
////
//// class C implements I {[| |]}
verify.rangeAfterCodeFix(`
method(a: number, ...b: string[]): boolean;
method(a: string, b: number): Function;
method(a: string): Function;
method(arg0: any, arg1?: any, ...arg2?: any[]) {
throw new Error('Method not implemented.');
}
`);