Fix generic completion tests

microsoft · timsuchanek · Jun 25, 2019 · Jul 12, 2019 · Jul 12, 2019 · Jul 16, 2019
commit 96a782ee4c426e58d0a2ad9f00f85e86f78c010c
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -3223,7 +3223,7 @@ namespace ts {
 
         getRootSymbols(symbol: Symbol): readonly Symbol[];
         getContextualType(node: Expression): Type | undefined;
-        /* @internal */ getContextualType(node: Expression, contextFlags?: ContextFlags): Type | undefined; // tslint:disable-line unified-signatures
+        /* @internal */ getContextualType(node: Expression, contextFlags?: ContextFlags): Type | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
         /* @internal */ getContextualTypeForObjectLiteralElement(element: ObjectLiteralElementLike): Type | undefined;
         /* @internal */ getContextualTypeForArgumentAtIndex(call: CallLikeExpression, argIndex: number): Type | undefined;
         /* @internal */ getContextualTypeForJsxAttribute(attribute: JsxAttribute | JsxSpreadAttribute): Type | undefined;

diff --git a/tests/cases/fourslash/completionsWithOptionalPropertiesGeneric.ts b/tests/cases/fourslash/completionsWithOptionalPropertiesGeneric.ts
@@ -8,4 +8,12 @@
 //// declare function bar<T extends MyOptions>(options?: Partial<T>): void;
 //// bar({ hello, /*1*/ });
 
-verify.completions({ marker: '1', includes: ['world'] })
+verify.completions({
+  marker: '1',
+  includes: [
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'world'
+    },
+  ]
+})
diff --git a/tests/cases/fourslash/completionsWithOptionalPropertiesGenericConstructor.ts b/tests/cases/fourslash/completionsWithOptionalPropertiesGenericConstructor.ts
@@ -12,5 +12,16 @@
 //// 
 //// new Clazz({ /*1*/ })
 
-verify.completions({ marker: '1', includes: ['someFunction', 'anotherFunction'] })
-
+verify.completions({
+  marker: '1',
+  includes: [
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'someFunction'
+    },
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'anotherFunction'
+    },
+  ]
+})
diff --git a/tests/cases/fourslash/completionsWithOptionalPropertiesGenericDeep.ts b/tests/cases/fourslash/completionsWithOptionalPropertiesGenericDeep.ts
@@ -12,4 +12,12 @@
 //// declare function bar<T extends MyOptions>(options?: Partial<T>): void;
 //// bar({ deep: {/*1*/} });
 
-verify.completions({ marker: '1', includes: ['another'] })
+verify.completions({
+  marker: '1',
+  includes: [
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'another'
+    },
+  ]
+})
diff --git a/tests/cases/fourslash/completionsWithOptionalPropertiesGenericPartial.ts b/tests/cases/fourslash/completionsWithOptionalPropertiesGenericPartial.ts
@@ -10,4 +10,24 @@
 //// function partialFoo<T extends Partial<Foo>>(t: T) {return t}
 //// partialFoo({ /*1*/ });
 
-verify.completions({ marker: '1', includes: ['a_a', 'a_b', 'a_c', 'b_a'] })
+verify.completions({
+  marker: '1',
+  includes: [
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'a_a'
+    },
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'a_b'
+    },
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'a_c'
+    },
+    {
+      sortText: completion.SortText.OptionalMember,
+      name: 'b_a'
+    },
+  ]
+})