Skip to content

Retry string completions from the inferred type by default#53481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Daniel Rosenwasser (DanielRosenwasser) merged 1 commit into from
Mar 28, 2023
Merged

Retry string completions from the inferred type by default #53481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/services/stringCompletions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -439,7 +439,7 @@ function getStringLiteralCompletionEntries(sourceFile: SourceFile, node: StringL
const literals = contextualTypes.types.filter(literal => !tracker.hasValue(literal.value));
return { kind: StringLiteralCompletionKind.Types, types: literals, isNewIdentifier: false };
default:
return fromContextualType();
return fromContextualType() || fromContextualType(ContextFlags.None);

@AndaristMateusz Burzyński (Andarist)Mar 23, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a more conservative approach would be to do this:

caseSyntaxKind.ArrayLiteralExpression:
returnfromContextualType()||fromContextualType(ContextFlags.None);
default:
returnfromContextualType();

i went for a broad fix~ but perhaps some node types should not be subjects for those retries?

}

function fromContextualType(contextFlags: ContextFlags = ContextFlags.Completions): StringLiteralCompletionsFromTypes | undefined {
Expand Down
16 changes: 16 additions & 0 deletions tests/cases/fourslash/completionsLiteralFromInferenceWithinInferredType3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
/// <reference path="fourslash.ts" />

//// declare function test<T>(a: {
//// [K in keyof T]: {
//// b?: (keyof T)[];
//// };
//// }): void;
////
//// test({
//// foo: {},
//// bar: {
//// b: ["/*ts*/"],
//// },
//// });

verify.completions({ marker: ["ts"], exact: ["foo", "bar"] });