Paramter -> Parameter

This commit is contained in:
Daniel Rosenwasser
2014-11-19 11:55:05 -08:00
parent 513a8c3e97
commit b98f6b4688
40 changed files with 59 additions and 60 deletions

View File

@@ -301,11 +301,11 @@ module FourSlashInterface {
FourSlash.currentTestState.verifySignatureHelpArgumentCount(expected);
}
public currentSignatureParamterCountIs(expected: number) {
public currentSignatureParameterCountIs(expected: number) {
FourSlash.currentTestState.verifyCurrentSignatureHelpParameterCount(expected);
}
public currentSignatureTypeParamterCountIs(expected: number) {
public currentSignatureTypeParameterCountIs(expected: number) {
FourSlash.currentTestState.verifyCurrentSignatureHelpTypeParameterCount(expected);
}

View File

@@ -14,7 +14,7 @@
////testFunction<, ,/*5*/>(null, null, null);
// goTo.marker("1");
// verify.currentSignatureParamterCountIs(3);
// verify.currentSignatureParameterCountIs(3);
// verify.currentSignatureHelpIs("testFunction<T extends IFoo, U, M extends IFoo>(a: T, b: U, c: M): M");
// verify.currentParameterHelpArgumentNameIs("T");

View File

@@ -7,7 +7,7 @@
goTo.marker('anonymousFunction1');
verify.signatureHelpCountIs(1);
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs('(a: number, b: string): string');
verify.currentParameterHelpArgumentNameIs("a");
verify.currentParameterSpanIs("a: number");

View File

@@ -10,6 +10,6 @@ verify.signatureHelpPresent();
verify.signatureHelpCountIs(1);
verify.currentSignatureHelpIs("Foo(arg1: string, arg2: string): void");
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentParameterHelpArgumentNameIs("arg1");
verify.currentParameterSpanIs("arg1: string");

View File

@@ -10,6 +10,6 @@ verify.signatureHelpPresent();
verify.signatureHelpCountIs(1);
verify.currentSignatureHelpIs("Foo(arg1: string, arg2: string): void");
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentParameterHelpArgumentNameIs("arg1");
verify.currentParameterSpanIs("arg1: string");

View File

@@ -5,7 +5,7 @@
goTo.marker('1');
verify.signatureHelpCountIs(1);
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs('fnTest(str: string, num: number): void');
verify.currentParameterHelpArgumentNameIs('str');

View File

@@ -6,7 +6,7 @@
goTo.marker('1');
verify.signatureHelpCountIs(1);
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs('sampleCls(str: string, num: number): sampleCls');
verify.currentParameterHelpArgumentNameIs('str');

View File

@@ -16,7 +16,7 @@
goTo.marker('indirectSuperCall');
verify.signatureHelpCountIs(2);
verify.currentSignatureParamterCountIs(1);
verify.currentSignatureParameterCountIs(1);
verify.currentSignatureHelpIs('B2(n: number): B2');
verify.currentParameterHelpArgumentNameIs("n");
verify.currentParameterSpanIs("n: number");

View File

@@ -6,11 +6,11 @@
goTo.marker('1');
verify.signatureHelpCountIs(2);
verify.currentSignatureParamterCountIs(0);
verify.currentSignatureParameterCountIs(0);
verify.currentSignatureHelpIs('clsOverload(): clsOverload');
goTo.marker('2');
verify.currentSignatureParamterCountIs(1);
verify.currentSignatureParameterCountIs(1);
verify.currentSignatureHelpIs('clsOverload(test: string): clsOverload');
verify.currentParameterHelpArgumentNameIs('test');
verify.currentParameterSpanIs("test: string");

View File

@@ -12,7 +12,7 @@ verify.signatureHelpPresent();
verify.signatureHelpCountIs(1);
verify.currentSignatureHelpIs("Foo(arg1: string, arg2: string): void");
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentParameterHelpArgumentNameIs("arg1");
verify.currentParameterSpanIs("arg1: string");

View File

@@ -8,11 +8,11 @@
goTo.marker('functionOverload1');
verify.signatureHelpCountIs(2);
verify.currentSignatureParamterCountIs(0);
verify.currentSignatureParameterCountIs(0);
verify.currentSignatureHelpIs('functionOverload(): any');
goTo.marker('functionOverload2');
verify.currentSignatureParamterCountIs(1);
verify.currentSignatureParameterCountIs(1);
verify.currentSignatureHelpIs('functionOverload(test: string): any');
verify.currentParameterHelpArgumentNameIs("test");
verify.currentParameterSpanIs("test: string");

View File

@@ -6,7 +6,7 @@
goTo.marker('parameterFunction1');
verify.signatureHelpCountIs(1);
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs('callback(a: number, b: string): void');
verify.currentParameterHelpArgumentNameIs("a");
verify.currentParameterSpanIs("a: number");

View File

@@ -7,4 +7,4 @@
goTo.marker();
verify.signatureHelpCountIs(1);
verify.currentSignatureHelpIs("ImplicitConstructor(): ImplicitConstructor");
verify.currentSignatureParamterCountIs(0);
verify.currentSignatureParameterCountIs(0);

View File

@@ -17,13 +17,13 @@
goTo.marker('incompleteCalls1');
verify.currentSignatureHelpIs("f1(): void");
verify.currentSignatureParamterCountIs(0);
verify.currentSignatureParameterCountIs(0);
goTo.marker('incompleteCalls2');
verify.currentSignatureParamterCountIs(1);
verify.currentSignatureParameterCountIs(1);
verify.currentSignatureHelpIs("f2(n: number): number");
goTo.marker('incompleteCalls3');
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs("f3(n: number, s: string): string");
verify.currentParameterHelpArgumentNameIs("s");

View File

@@ -1,17 +1,17 @@
/// <reference path='fourslash.ts' />
////var objectLiteral = { n: 5, s: "", f: (a: number, b: string) => "" };
////objectLiteral.f(/*objectLiteral1*/4, /*objectLiteral2*/"");
goTo.marker('objectLiteral1');
verify.signatureHelpCountIs(1);
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureHelpIs('f(a: number, b: string): string');
verify.currentParameterHelpArgumentNameIs("a");
verify.currentParameterSpanIs("a: number");
goTo.marker('objectLiteral2');
verify.currentSignatureHelpIs('f(a: number, b: string): string');
////objectLiteral.f(/*objectLiteral1*/4, /*objectLiteral2*/"");
goTo.marker('objectLiteral1');
verify.signatureHelpCountIs(1);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs('f(a: number, b: string): string');
verify.currentParameterHelpArgumentNameIs("a");
verify.currentParameterSpanIs("a: number");
goTo.marker('objectLiteral2');
verify.currentSignatureHelpIs('f(a: number, b: string): string');
verify.currentParameterHelpArgumentNameIs("b");
verify.currentParameterSpanIs("b: string");

View File

@@ -10,17 +10,17 @@
goTo.marker();
verify.signatureHelpCountIs(4);
verify.currentSignatureHelpIs("f(): any");
verify.currentSignatureParamterCountIs(0);
verify.currentSignatureParameterCountIs(0);
verify.signatureHelpArgumentCountIs(0);
edit.insert(", ");
verify.signatureHelpCountIs(4);
verify.currentSignatureHelpIs("f(s: string, b: boolean): any");
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentParameterHelpArgumentNameIs("b");
verify.currentParameterSpanIs("b: boolean");
edit.insert(", ");
verify.signatureHelpCountIs(4);
verify.currentSignatureHelpIs("f(s: string, b: boolean): any");
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);

View File

@@ -20,9 +20,9 @@
goTo.marker('superOverload1');
verify.signatureHelpCountIs(2);
verify.currentSignatureHelpIs("SuperOverloadlBase(): SuperOverloadlBase");
verify.currentSignatureParamterCountIs(0);
verify.currentSignatureParameterCountIs(0);
goTo.marker('superOverload2');
verify.currentSignatureParamterCountIs(1);
verify.currentSignatureParameterCountIs(1);
verify.currentSignatureHelpIs("SuperOverloadlBase(test: string): SuperOverloadlBase");
verify.currentParameterHelpArgumentNameIs("test");
verify.currentParameterSpanIs("test: string");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(4);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(4);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(4);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("x");
verify.currentParameterSpanIs("x: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(4);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("y");
verify.currentParameterSpanIs("y: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(4);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("z");
verify.currentParameterSpanIs("z: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(1);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('g(templateStrings: any, x: any, y: any, z: any): string');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(1);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(2);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(2);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("x");
verify.currentParameterSpanIs("x: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(2);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("y");
verify.currentParameterSpanIs("y: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");

View File

@@ -11,7 +11,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("y");
verify.currentParameterSpanIs("y: any");

View File

@@ -10,6 +10,6 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(1);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('g(templateStrings: any, x: any, y: any, z: any): string');
});

View File

@@ -4,13 +4,12 @@
//// function g(templateStrings, x, y, z) { return ""; }
////
//// f `/*1*/a $/*2*/{ /*3*/g /*4*/`alpha ${ 123 } beta ${ 456 } gamma`/*5*/ }/*6*/ b $/*7*/{ /*8*/g /*9*/`txt`/*10*/ } /*11*/c ${ /*12*/g /*13*/`aleph ${ 123 } beit`/*14*/ } d/*15*/`;
debugger;
test.markers().forEach(m => {
goTo.position(m.position);
verify.signatureHelpCountIs(1);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
});

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(2);
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o1: string): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: string[]");

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(2);
verify.currentSignatureParamterCountIs(2);
verify.currentSignatureParameterCountIs(2);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o1: string): number');
verify.currentParameterHelpArgumentNameIs("p1_o1");
verify.currentParameterSpanIs("p1_o1: string");

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o3: string, p2_o3: boolean, p3_o3: number): boolean');
verify.currentParameterHelpArgumentNameIs("p1_o3");
verify.currentParameterSpanIs("p1_o3: string");

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o2: number, p2_o2: number, p3_o2: number): string');
verify.currentParameterHelpArgumentNameIs("p1_o2");
verify.currentParameterSpanIs("p1_o2: number");

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o2: number, p2_o2: number, p3_o2: number): string');
verify.currentParameterHelpArgumentNameIs("p2_o2");
verify.currentParameterSpanIs("p2_o2: number");

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o2: number, p2_o2: number, p3_o2: number): string');
verify.currentParameterHelpArgumentNameIs("p2_o2");
verify.currentParameterSpanIs("p2_o2: number");

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o3: string, p2_o3: boolean, p3_o3: number): boolean');
verify.currentParameterHelpArgumentNameIs("p2_o3");
verify.currentParameterSpanIs("p2_o3: boolean");

View File

@@ -13,7 +13,7 @@ test.markers().forEach(m => {
verify.signatureHelpCountIs(3);
verify.signatureHelpArgumentCountIs(4);
verify.currentSignatureParamterCountIs(4);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: string[], p1_o2: number, p2_o2: number, p3_o2: number): string');
verify.currentParameterHelpArgumentNameIs("p3_o2");
verify.currentParameterSpanIs("p3_o2: number");