diff --git a/tests/cases/fourslash_old/completionBeforeSemanticDiagnosticsInArrowFunction1.ts b/tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts similarity index 100% rename from tests/cases/fourslash_old/completionBeforeSemanticDiagnosticsInArrowFunction1.ts rename to tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts diff --git a/tests/cases/fourslash_old/completionEntryForPrimitive.ts b/tests/cases/fourslash/completionEntryForPrimitive.ts similarity index 100% rename from tests/cases/fourslash_old/completionEntryForPrimitive.ts rename to tests/cases/fourslash/completionEntryForPrimitive.ts diff --git a/tests/cases/fourslash_old/completionInTypeOf1.ts b/tests/cases/fourslash/completionInTypeOf1.ts similarity index 100% rename from tests/cases/fourslash_old/completionInTypeOf1.ts rename to tests/cases/fourslash/completionInTypeOf1.ts diff --git a/tests/cases/fourslash_old/completionListAfterNumericLiteral.ts b/tests/cases/fourslash/completionListAfterNumericLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/completionListAfterNumericLiteral.ts rename to tests/cases/fourslash/completionListAfterNumericLiteral.ts diff --git a/tests/cases/fourslash_old/completionListAfterObjectLiteral1.ts b/tests/cases/fourslash/completionListAfterObjectLiteral1.ts similarity index 100% rename from tests/cases/fourslash_old/completionListAfterObjectLiteral1.ts rename to tests/cases/fourslash/completionListAfterObjectLiteral1.ts diff --git a/tests/cases/fourslash_old/completionListAtEOF2.ts b/tests/cases/fourslash/completionListAtEOF2.ts similarity index 100% rename from tests/cases/fourslash_old/completionListAtEOF2.ts rename to tests/cases/fourslash/completionListAtEOF2.ts diff --git a/tests/cases/fourslash_old/completionListAtNodeBoundry.ts b/tests/cases/fourslash/completionListAtNodeBoundry.ts similarity index 100% rename from tests/cases/fourslash_old/completionListAtNodeBoundry.ts rename to tests/cases/fourslash/completionListAtNodeBoundry.ts diff --git a/tests/cases/fourslash_old/completionListBeforeKeyword.ts b/tests/cases/fourslash/completionListBeforeKeyword.ts similarity index 100% rename from tests/cases/fourslash_old/completionListBeforeKeyword.ts rename to tests/cases/fourslash/completionListBeforeKeyword.ts diff --git a/tests/cases/fourslash_old/completionListCladule.ts b/tests/cases/fourslash/completionListCladule.ts similarity index 100% rename from tests/cases/fourslash_old/completionListCladule.ts rename to tests/cases/fourslash/completionListCladule.ts diff --git a/tests/cases/fourslash_old/completionListClassMembers.ts b/tests/cases/fourslash/completionListClassMembers.ts similarity index 100% rename from tests/cases/fourslash_old/completionListClassMembers.ts rename to tests/cases/fourslash/completionListClassMembers.ts diff --git a/tests/cases/fourslash_old/completionListEnumMembers.ts b/tests/cases/fourslash/completionListEnumMembers.ts similarity index 100% rename from tests/cases/fourslash_old/completionListEnumMembers.ts rename to tests/cases/fourslash/completionListEnumMembers.ts diff --git a/tests/cases/fourslash_old/completionListEnumValues.ts b/tests/cases/fourslash/completionListEnumValues.ts similarity index 100% rename from tests/cases/fourslash_old/completionListEnumValues.ts rename to tests/cases/fourslash/completionListEnumValues.ts diff --git a/tests/cases/fourslash_old/completionListForDerivedType1.ts b/tests/cases/fourslash/completionListForDerivedType1.ts similarity index 73% rename from tests/cases/fourslash_old/completionListForDerivedType1.ts rename to tests/cases/fourslash/completionListForDerivedType1.ts index a3dd192a754..0c514713c21 100644 --- a/tests/cases/fourslash_old/completionListForDerivedType1.ts +++ b/tests/cases/fourslash/completionListForDerivedType1.ts @@ -12,10 +12,10 @@ ////f2./*2*/ // here bar has return type any, but bar2 is Foo2 goTo.marker('1'); -verify.completionListContains('bar', '(): IFoo'); +verify.completionListContains('bar', '() => IFoo'); verify.not.completionListContains('bar2'); edit.insert('bar();'); // just to make the file valid before checking next completion location goTo.marker('2'); -verify.completionListContains('bar', '(): IFoo'); -verify.completionListContains('bar2', '(): IFoo2'); \ No newline at end of file +verify.completionListContains('bar', '() => IFoo'); +verify.completionListContains('bar2', '() => IFoo2'); \ No newline at end of file diff --git a/tests/cases/fourslash_old/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts b/tests/cases/fourslash/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts similarity index 100% rename from tests/cases/fourslash_old/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts rename to tests/cases/fourslash/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts diff --git a/tests/cases/fourslash_old/completionListFunctionExpression.ts b/tests/cases/fourslash/completionListFunctionExpression.ts similarity index 100% rename from tests/cases/fourslash_old/completionListFunctionExpression.ts rename to tests/cases/fourslash/completionListFunctionExpression.ts diff --git a/tests/cases/fourslash_old/completionListGenericConstraints.ts b/tests/cases/fourslash/completionListGenericConstraints.ts similarity index 100% rename from tests/cases/fourslash_old/completionListGenericConstraints.ts rename to tests/cases/fourslash/completionListGenericConstraints.ts diff --git a/tests/cases/fourslash_old/completionListGenericConstraintsNames.ts b/tests/cases/fourslash/completionListGenericConstraintsNames.ts similarity index 100% rename from tests/cases/fourslash_old/completionListGenericConstraintsNames.ts rename to tests/cases/fourslash/completionListGenericConstraintsNames.ts diff --git a/tests/cases/fourslash_old/completionListInContextuallyTypedArgument.ts b/tests/cases/fourslash/completionListInContextuallyTypedArgument.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInContextuallyTypedArgument.ts rename to tests/cases/fourslash/completionListInContextuallyTypedArgument.ts diff --git a/tests/cases/fourslash_old/completionListInExtendsClause.ts b/tests/cases/fourslash/completionListInExtendsClause.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInExtendsClause.ts rename to tests/cases/fourslash/completionListInExtendsClause.ts diff --git a/tests/cases/fourslash_old/completionListInExtendsClauseAtEOF.ts b/tests/cases/fourslash/completionListInExtendsClauseAtEOF.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInExtendsClauseAtEOF.ts rename to tests/cases/fourslash/completionListInExtendsClauseAtEOF.ts diff --git a/tests/cases/fourslash_old/completionListInNamedFunctionExpression.ts b/tests/cases/fourslash/completionListInNamedFunctionExpression.ts similarity index 85% rename from tests/cases/fourslash_old/completionListInNamedFunctionExpression.ts rename to tests/cases/fourslash/completionListInNamedFunctionExpression.ts index 6023cfee444..a4dd328e1ed 100644 --- a/tests/cases/fourslash_old/completionListInNamedFunctionExpression.ts +++ b/tests/cases/fourslash/completionListInNamedFunctionExpression.ts @@ -24,9 +24,9 @@ goTo.marker("insideFunctionExpression"); verify.memberListContains("foo"); goTo.marker("referenceInsideFunctionExpression"); -verify.quickInfoIs("(): number"); +verify.quickInfoIs("() => number"); goTo.marker("referenceInGlobalScope"); -verify.quickInfoIs("(a: number): string"); +verify.quickInfoIs("(a: number) => string"); diff --git a/tests/cases/fourslash_old/completionListInObjectLiteral3.ts b/tests/cases/fourslash/completionListInObjectLiteral3.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInObjectLiteral3.ts rename to tests/cases/fourslash/completionListInObjectLiteral3.ts diff --git a/tests/cases/fourslash_old/completionListInTypedObjectLiterals.ts b/tests/cases/fourslash/completionListInTypedObjectLiterals.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInTypedObjectLiterals.ts rename to tests/cases/fourslash/completionListInTypedObjectLiterals.ts diff --git a/tests/cases/fourslash_old/completionListInTypedObjectLiterals2.ts b/tests/cases/fourslash/completionListInTypedObjectLiterals2.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInTypedObjectLiterals2.ts rename to tests/cases/fourslash/completionListInTypedObjectLiterals2.ts diff --git a/tests/cases/fourslash_old/completionListInTypedObjectLiterals3.ts b/tests/cases/fourslash/completionListInTypedObjectLiterals3.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInTypedObjectLiterals3.ts rename to tests/cases/fourslash/completionListInTypedObjectLiterals3.ts diff --git a/tests/cases/fourslash_old/completionListInTypedObjectLiterals4.ts b/tests/cases/fourslash/completionListInTypedObjectLiterals4.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInTypedObjectLiterals4.ts rename to tests/cases/fourslash/completionListInTypedObjectLiterals4.ts diff --git a/tests/cases/fourslash_old/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts b/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts rename to tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts diff --git a/tests/cases/fourslash_old/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts b/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts rename to tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts diff --git a/tests/cases/fourslash_old/completionListInsideTargetTypedFunction.ts b/tests/cases/fourslash/completionListInsideTargetTypedFunction.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInsideTargetTypedFunction.ts rename to tests/cases/fourslash/completionListInsideTargetTypedFunction.ts diff --git a/tests/cases/fourslash_old/completionListInvalidMemberNames.ts b/tests/cases/fourslash/completionListInvalidMemberNames.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInvalidMemberNames.ts rename to tests/cases/fourslash/completionListInvalidMemberNames.ts diff --git a/tests/cases/fourslash_old/completionListInvalidMemberNames2.ts b/tests/cases/fourslash/completionListInvalidMemberNames2.ts similarity index 100% rename from tests/cases/fourslash_old/completionListInvalidMemberNames2.ts rename to tests/cases/fourslash/completionListInvalidMemberNames2.ts diff --git a/tests/cases/fourslash_old/completionListModuleMembers.ts b/tests/cases/fourslash/completionListModuleMembers.ts similarity index 100% rename from tests/cases/fourslash_old/completionListModuleMembers.ts rename to tests/cases/fourslash/completionListModuleMembers.ts diff --git a/tests/cases/fourslash_old/completionListObjectMembers.ts b/tests/cases/fourslash/completionListObjectMembers.ts similarity index 80% rename from tests/cases/fourslash_old/completionListObjectMembers.ts rename to tests/cases/fourslash/completionListObjectMembers.ts index 63c0e96bc04..c23eff12dbc 100644 --- a/tests/cases/fourslash_old/completionListObjectMembers.ts +++ b/tests/cases/fourslash/completionListObjectMembers.ts @@ -11,4 +11,4 @@ goTo.marker(); verify.memberListContains("bar", 'any'); -verify.memberListContains("foo", '(bar: any): any'); +verify.memberListContains("foo", '(bar: any) => any'); diff --git a/tests/cases/fourslash_old/completionListOnFunctionCallWithOptionalArgument.ts b/tests/cases/fourslash/completionListOnFunctionCallWithOptionalArgument.ts similarity index 100% rename from tests/cases/fourslash_old/completionListOnFunctionCallWithOptionalArgument.ts rename to tests/cases/fourslash/completionListOnFunctionCallWithOptionalArgument.ts diff --git a/tests/cases/fourslash_old/completionListOnParam.ts b/tests/cases/fourslash/completionListOnParam.ts similarity index 100% rename from tests/cases/fourslash_old/completionListOnParam.ts rename to tests/cases/fourslash/completionListOnParam.ts diff --git a/tests/cases/fourslash_old/completionListOnVarBetweenModules.ts b/tests/cases/fourslash/completionListOnVarBetweenModules.ts similarity index 100% rename from tests/cases/fourslash_old/completionListOnVarBetweenModules.ts rename to tests/cases/fourslash/completionListOnVarBetweenModules.ts diff --git a/tests/cases/fourslash_old/completionListPrimitives.ts b/tests/cases/fourslash/completionListPrimitives.ts similarity index 100% rename from tests/cases/fourslash_old/completionListPrimitives.ts rename to tests/cases/fourslash/completionListPrimitives.ts diff --git a/tests/cases/fourslash_old/completionListPrivateMembers.ts b/tests/cases/fourslash/completionListPrivateMembers.ts similarity index 100% rename from tests/cases/fourslash_old/completionListPrivateMembers.ts rename to tests/cases/fourslash/completionListPrivateMembers.ts diff --git a/tests/cases/fourslash_old/completionListSuperMembers.ts b/tests/cases/fourslash/completionListSuperMembers.ts similarity index 100% rename from tests/cases/fourslash_old/completionListSuperMembers.ts rename to tests/cases/fourslash/completionListSuperMembers.ts diff --git a/tests/cases/fourslash_old/completionListWithUnresolvedModule.ts b/tests/cases/fourslash/completionListWithUnresolvedModule.ts similarity index 100% rename from tests/cases/fourslash_old/completionListWithUnresolvedModule.ts rename to tests/cases/fourslash/completionListWithUnresolvedModule.ts diff --git a/tests/cases/fourslash_old/memberCompletionFromFunctionCall.ts b/tests/cases/fourslash/memberCompletionFromFunctionCall.ts similarity index 100% rename from tests/cases/fourslash_old/memberCompletionFromFunctionCall.ts rename to tests/cases/fourslash/memberCompletionFromFunctionCall.ts diff --git a/tests/cases/fourslash_old/memberCompletionInForEach1.ts b/tests/cases/fourslash/memberCompletionInForEach1.ts similarity index 100% rename from tests/cases/fourslash_old/memberCompletionInForEach1.ts rename to tests/cases/fourslash/memberCompletionInForEach1.ts diff --git a/tests/cases/fourslash_old/memberCompletionOnTypeParameters.ts b/tests/cases/fourslash/memberCompletionOnTypeParameters.ts similarity index 100% rename from tests/cases/fourslash_old/memberCompletionOnTypeParameters.ts rename to tests/cases/fourslash/memberCompletionOnTypeParameters.ts diff --git a/tests/cases/fourslash_old/memberCompletionOnTypeParameters2.ts b/tests/cases/fourslash/memberCompletionOnTypeParameters2.ts similarity index 100% rename from tests/cases/fourslash_old/memberCompletionOnTypeParameters2.ts rename to tests/cases/fourslash/memberCompletionOnTypeParameters2.ts diff --git a/tests/cases/fourslash/memberListInReopenedEnum.ts b/tests/cases/fourslash/memberListInReopenedEnum.ts new file mode 100644 index 00000000000..ede924b678f --- /dev/null +++ b/tests/cases/fourslash/memberListInReopenedEnum.ts @@ -0,0 +1,18 @@ +/// + +////module M { +//// enum E { +//// A, B +//// } +//// enum E { +//// C = 0, D +//// } +//// var x = E./*1*/ +////} + + +goTo.marker('1'); +verify.memberListContains('A', 'E', undefined, "E.A"); +verify.memberListContains('B', 'E', undefined, "E.B"); +verify.memberListContains('C', 'E', undefined, "E.C"); +verify.memberListContains('D', 'E', undefined, "E.D"); \ No newline at end of file diff --git a/tests/cases/fourslash_old/memberListInWithBlock.ts b/tests/cases/fourslash/memberListInWithBlock.ts similarity index 100% rename from tests/cases/fourslash_old/memberListInWithBlock.ts rename to tests/cases/fourslash/memberListInWithBlock.ts diff --git a/tests/cases/fourslash_old/memberListInsideObjectLiterals.ts b/tests/cases/fourslash/memberListInsideObjectLiterals.ts similarity index 100% rename from tests/cases/fourslash_old/memberListInsideObjectLiterals.ts rename to tests/cases/fourslash/memberListInsideObjectLiterals.ts diff --git a/tests/cases/fourslash_old/memberListOfClass.ts b/tests/cases/fourslash/memberListOfClass.ts similarity index 78% rename from tests/cases/fourslash_old/memberListOfClass.ts rename to tests/cases/fourslash/memberListOfClass.ts index c6ac4973fb7..a28f568b758 100644 --- a/tests/cases/fourslash_old/memberListOfClass.ts +++ b/tests/cases/fourslash/memberListOfClass.ts @@ -10,6 +10,7 @@ ////f./**/ goTo.marker(); +debug.printCompletionListMembers(); verify.memberListCount(2); verify.memberListContains('pubMeth', '(): void'); verify.memberListContains('pubProp', 'number'); \ No newline at end of file diff --git a/tests/cases/fourslash_old/memberListOfEnumFromExternalModule.ts b/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts similarity index 100% rename from tests/cases/fourslash_old/memberListOfEnumFromExternalModule.ts rename to tests/cases/fourslash/memberListOfEnumFromExternalModule.ts diff --git a/tests/cases/fourslash_old/memberListOfExportedClass.ts b/tests/cases/fourslash/memberListOfExportedClass.ts similarity index 75% rename from tests/cases/fourslash_old/memberListOfExportedClass.ts rename to tests/cases/fourslash/memberListOfExportedClass.ts index a564504e7ef..853856747de 100644 --- a/tests/cases/fourslash_old/memberListOfExportedClass.ts +++ b/tests/cases/fourslash/memberListOfExportedClass.ts @@ -11,5 +11,6 @@ ////c./**/ // test on c. goTo.marker(); +debug.printCompletionListMembers(); verify.memberListCount(1); verify.memberListContains('pub', 'number'); \ No newline at end of file diff --git a/tests/cases/fourslash_old/memberListOfModule.ts b/tests/cases/fourslash/memberListOfModule.ts similarity index 100% rename from tests/cases/fourslash_old/memberListOfModule.ts rename to tests/cases/fourslash/memberListOfModule.ts diff --git a/tests/cases/fourslash_old/memberListOfModuleBeforeKeyword.ts b/tests/cases/fourslash/memberListOfModuleBeforeKeyword.ts similarity index 100% rename from tests/cases/fourslash_old/memberListOfModuleBeforeKeyword.ts rename to tests/cases/fourslash/memberListOfModuleBeforeKeyword.ts diff --git a/tests/cases/fourslash_old/memberListOnFunctionParameter.ts b/tests/cases/fourslash/memberListOnFunctionParameter.ts similarity index 100% rename from tests/cases/fourslash_old/memberListOnFunctionParameter.ts rename to tests/cases/fourslash/memberListOnFunctionParameter.ts diff --git a/tests/cases/fourslash_old/memberListOnThisInClassWithPrivates.ts b/tests/cases/fourslash/memberListOnThisInClassWithPrivates.ts similarity index 58% rename from tests/cases/fourslash_old/memberListOnThisInClassWithPrivates.ts rename to tests/cases/fourslash/memberListOnThisInClassWithPrivates.ts index 1b77948f175..6df5b555778 100644 --- a/tests/cases/fourslash_old/memberListOnThisInClassWithPrivates.ts +++ b/tests/cases/fourslash/memberListOnThisInClassWithPrivates.ts @@ -8,6 +8,6 @@ ////} goTo.marker(); -verify.memberListContains('privMeth', '(): void'); -verify.memberListContains('pubMeth', '(): void'); +verify.memberListContains('privMeth', '() => void'); +verify.memberListContains('pubMeth', '() => void'); verify.memberListContains('pubProp', 'number'); \ No newline at end of file diff --git a/tests/cases/fourslash_old/memberListInReopenedEnum.ts b/tests/cases/fourslash_old/memberListInReopenedEnum.ts deleted file mode 100644 index b1168f54b15..00000000000 --- a/tests/cases/fourslash_old/memberListInReopenedEnum.ts +++ /dev/null @@ -1,18 +0,0 @@ -/// - -////module M { -//// enum E { -//// A, B -//// } -//// enum E { -//// C = 0, D -//// } -//// var x = E./*1*/ -////} - - -goTo.marker('1'); -verify.memberListContains('A', 'E', undefined, "M.E.A"); -verify.memberListContains('B', 'E', undefined, "M.E.B"); -verify.memberListContains('C', 'E', undefined, "M.E.C"); -verify.memberListContains('D', 'E', undefined, "M.E.D"); \ No newline at end of file