Skip to content

Commit 96a782e

Browse files
committed
Fix generic completion tests
1 parent c1a47a5 commit 96a782e

5 files changed

+53
-6
lines changed

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3223,7 +3223,7 @@ namespace ts {
32233223

32243224
getRootSymbols(symbol: Symbol): readonly Symbol[];
32253225
getContextualType(node: Expression): Type | undefined;
3226-
/* @internal */ getContextualType(node: Expression, contextFlags?: ContextFlags): Type | undefined; // tslint:disable-line unified-signatures
3226+
/* @internal */ getContextualType(node: Expression, contextFlags?: ContextFlags): Type | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
32273227
/* @internal */ getContextualTypeForObjectLiteralElement(element: ObjectLiteralElementLike): Type | undefined;
32283228
/* @internal */ getContextualTypeForArgumentAtIndex(call: CallLikeExpression, argIndex: number): Type | undefined;
32293229
/* @internal */ getContextualTypeForJsxAttribute(attribute: JsxAttribute | JsxSpreadAttribute): Type | undefined;

tests/cases/fourslash/completionsWithOptionalPropertiesGeneric.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,12 @@
88
//// declare function bar<T extends MyOptions>(options?: Partial<T>): void;
99
//// bar({ hello, /*1*/ });
1010

11-
verify.completions({ marker: '1', includes: ['world'] })
11+
verify.completions({
12+
marker: '1',
13+
includes: [
14+
{
15+
sortText: completion.SortText.OptionalMember,
16+
name: 'world'
17+
},
18+
]
19+
})

tests/cases/fourslash/completionsWithOptionalPropertiesGenericConstructor.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,16 @@
1212
////
1313
//// new Clazz({ /*1*/ })
1414

15-
verify.completions({ marker: '1', includes: ['someFunction', 'anotherFunction'] })
16-
15+
verify.completions({
16+
marker: '1',
17+
includes: [
18+
{
19+
sortText: completion.SortText.OptionalMember,
20+
name: 'someFunction'
21+
},
22+
{
23+
sortText: completion.SortText.OptionalMember,
24+
name: 'anotherFunction'
25+
},
26+
]
27+
})

tests/cases/fourslash/completionsWithOptionalPropertiesGenericDeep.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,12 @@
1212
//// declare function bar<T extends MyOptions>(options?: Partial<T>): void;
1313
//// bar({ deep: {/*1*/} });
1414

15-
verify.completions({ marker: '1', includes: ['another'] })
15+
verify.completions({
16+
marker: '1',
17+
includes: [
18+
{
19+
sortText: completion.SortText.OptionalMember,
20+
name: 'another'
21+
},
22+
]
23+
})

tests/cases/fourslash/completionsWithOptionalPropertiesGenericPartial.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,24 @@
1010
//// function partialFoo<T extends Partial<Foo>>(t: T) {return t}
1111
//// partialFoo({ /*1*/ });
1212

13-
verify.completions({ marker: '1', includes: ['a_a', 'a_b', 'a_c', 'b_a'] })
13+
verify.completions({
14+
marker: '1',
15+
includes: [
16+
{
17+
sortText: completion.SortText.OptionalMember,
18+
name: 'a_a'
19+
},
20+
{
21+
sortText: completion.SortText.OptionalMember,
22+
name: 'a_b'
23+
},
24+
{
25+
sortText: completion.SortText.OptionalMember,
26+
name: 'a_c'
27+
},
28+
{
29+
sortText: completion.SortText.OptionalMember,
30+
name: 'b_a'
31+
},
32+
]
33+
})

0 commit comments

Comments
 (0)