Improve contextual completions

src/services/completions.ts

@@ -2595,7 +2595,7 @@ function getContextualType(previousToken: Node, position: number, sourceFile: So
                 isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent) && isEqualityOperatorKind(parent.operatorToken.kind) ?
                     // completion at `x ===/**/` should be for the right side
                     checker.getTypeAtLocation(parent.left) :
-                    checker.getContextualType(previousToken as Expression);
+                    checker.getContextualType(previousToken as Expression, ContextFlags.Completions) || checker.getContextualType(previousToken as Expression);
     }
 }
 

tests/cases/fourslash/completionEntryForArgumentConstrainedToString.ts

@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+//// declare function test<P extends "a" | "b">(p: P): void;
+////
+//// test(/*ts*/)
+////
+
+verify.completions({ marker: ["ts"], includes: ['"a"', '"b"'], isNewIdentifierLocation: true });

tests/cases/fourslash/completionEntryForArrayElementConstrainedToString.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+//// declare function test<T extends 'a' | 'b'>(a: { foo: T[] }): void
+////
+//// test({ foo: [/*ts*/] })
+
+verify.completions({ marker: ["ts"], includes: ['"a"', '"b"'], isNewIdentifierLocation: true });

tests/cases/fourslash/completionEntryForArrayElementConstrainedToString2.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+//// declare function test<T extends 'a' | 'b'>(a: { foo: T[] }): void
+////
+//// test({ foo: ['a', /*ts*/] })
+
+verify.completions({ marker: ["ts"], includes: ['"a"', '"b"'], isNewIdentifierLocation: true });

tests/cases/fourslash/completionEntryForPropertyConstrainedToString.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+//// declare function test<P extends "a" | "b">(p: { type: P }): void;
+////
+//// test({ type: /*ts*/ })
+
+verify.completions({ marker: ["ts"], includes: ['"a"', '"b"'], isNewIdentifierLocation: false });

tests/cases/fourslash/completionsLiteralFromInferenceWithinInferredType1.ts

@@ -13,5 +13,13 @@
 ////     b: "/*ts*/",
 ////   },
 //// });
+////
+//// test({
+////   foo: {},
+////   bar: {
+////     b: /*ts2*/,
+////   },
+//// });
 
 verify.completions({ marker: ["ts"], exact: ["foo", "bar"] });
+verify.completions({ marker: ["ts2"], includes: ['"foo"', '"bar"'], isNewIdentifierLocation: false });

tests/cases/fourslash/completionsLiteralFromInferenceWithinInferredType3.ts

@@ -12,5 +12,13 @@
 ////     b: ["/*ts*/"],
 ////   },
 //// });
+////
+//// test({
+////   foo: {},
+////   bar: {
+////     b: [/*ts2*/],
+////   },
+//// });
 
 verify.completions({ marker: ["ts"], exact: ["foo", "bar"] });
+verify.completions({ marker: ["ts2"], includes: ['"foo"', '"bar"'], isNewIdentifierLocation: true });