Fixed some string literal argument completions depending on resolved signature #53996

Andarist · 2023-04-24T16:37:22Z

…signature

Andarist · 2023-04-24T16:42:06Z

src/compiler/checker.ts

@@ -32436,7 +32440,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {

        for (let i = 0; i < argCount; i++) {
            const arg = args[i];
-            if (arg.kind !== SyntaxKind.OmittedExpression && !(checkMode & CheckMode.IsForStringLiteralArgumentCompletions && hasSkipDirectInferenceFlag(arg))) {


This change is quite nice (IMHO) because it eliminates the need for this special CheckMode almost entirely (in fact, the first commit in this PR does exactly that - it just doesn't fix the issue).

With this we can fully rely just on "node blocking" to alter the default inference behavior for the completion purposes.

Andarist · 2023-04-24T16:42:57Z

src/compiler/checker.ts

@@ -25198,7 +25202,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
            const constraint = getConstraintOfTypeParameter(inference.typeParameter);
            if (constraint) {
                const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-                if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                if (!inferredType || inferredType === wildcardType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {


This change might be best reviewed in isolation by reviewing the first commit: 7ab8679

Andarist · 2023-04-24T16:44:40Z

src/compiler/checker.ts

@@ -33318,7 +33321,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                    // If one or more context sensitive arguments were excluded, we start including
                    // them now (and keeping do so for any subsequent candidates) and perform a second
                    // round of type inference and applicability checking for this particular candidate.
-                    argCheckMode = checkMode & CheckMode.IsForStringLiteralArgumentCompletions;
+                    argCheckMode = CheckMode.Normal;


Thanks to the introduced changes this is just a revert of another PR: https://github.com/microsoft/TypeScript/pull/48811/files . The patch from that other PR is not needed anymore since we now rely on wildcardType returned by checkExpressionWorker for blocked string literals

Andarist · 2023-04-24T16:46:48Z

src/services/stringCompletions.ts

@@ -387,7 +388,7 @@ function getStringLiteralCompletionEntries(sourceFile: SourceFile, node: StringL
                // Get string literal completions from specialized signatures of the target
                // i.e. declare function f(a: 'A');
                // f("/*completion position*/")
-                return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType();
+                return argumentInfo && (getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker, CheckMode.Normal)) || fromContextualType();


This essentially implements the same "double request" strategy as the one introduced in #52875 (and later also used in #53481 and #53554 )

Andarist · 2023-04-24T16:48:34Z

src/compiler/checker.ts

@@ -1657,8 +1657,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
        getFullyQualifiedName,
        getResolvedSignature: (node, candidatesOutArray, argumentCount) =>
            getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, CheckMode.Normal),
-        getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) =>
-            runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(call, candidatesOutArray, /*argumentCount*/ undefined, CheckMode.IsForStringLiteralArgumentCompletions)),
+        getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray, checkMode = CheckMode.IsForStringLiteralArgumentCompletions) => {


After a second thought... this checkMode parameter could just be a boolean flag or something. We don't need this special CheckMode.IsForStringLiteralArgumentCompletions for anything now - it's only used to toggle the "inference blocking" behavior in this very function here. This is also reflected in the fact that I remove it from the checkMode that is passed to getResolvedSignatureWorker

Andarist · 2023-04-24T16:50:12Z

tests/cases/fourslash/stringCompletionsFromGenericConditionalTypesUsingTemplateLiteralTypes.ts

+////       }
+//// const parse = <def>(def: validate<def>) => def
+//// const shallowExpression = parse("foo|/*ts*/")
+//// const nestedExpression = parse({ prop: "foo|/*ts2*/" })


it's worth pointing out here that this nestedExpression was already working OK, the problem was in the shallowExpression's case as that was using a completely different part of the algorithm (getStringLiteralCompletionsFromSignature, and not getContextualType~)

…tion

jakebailey · 2023-05-03T23:22:13Z

@typescript-bot pack this

typescript-bot · 2023-05-03T23:22:15Z

Heya @jakebailey, I've started to run the tarball bundle task on this PR at 322f6cd. You can monitor the build here.

typescript-bot · 2023-05-03T23:23:48Z

Hey @jakebailey, I've packed this into an installable tgz. You can install it for testing by referencing it in your package.json like so:

{
    "devDependencies": {
        "typescript": "https://typescript.visualstudio.com/cf7ac146-d525-443c-b23c-0d58337efebc/_apis/build/builds/153805/artifacts?artifactName=tgz&fileId=E3D26348E1B679191216EF370BA7D1DCABCE3C70282A566490FC335882A4992C02&fileName=/typescript-5.1.0-insiders.20230503.tgz"
    }
}

and then running npm install.

There is also a playground for this build and an npm module you can use via "typescript": "npm:@typescript-deploys/pr-build@5.1.0-pr-53996-2".;

…tion # Conflicts: # src/services/stringCompletions.ts

Andarist added 2 commits April 24, 2023 18:09

Root out CheckMode.IsForStringLiteralArgumentCompletions

7ab8679

Fixed some string literal argument completions depending on resolved …

6d31988

…signature

typescript-bot added the For Uncommitted Bug PR for untriaged, rejected, closed or missing bug label Apr 24, 2023

Andarist commented Apr 24, 2023

View reviewed changes

sandersn requested a review from andrewbranch May 2, 2023 23:02

typescript-bot removed the For Uncommitted Bug PR for untriaged, rejected, closed or missing bug label May 2, 2023

sandersn requested a review from navya9singh May 2, 2023 23:02

typescript-bot added the For Backlog Bug PRs that fix a backlog bug label May 2, 2023

sandersn assigned navya9singh May 2, 2023

Merge remote-tracking branch 'origin/main' into fix-direct-arg-comple…

322f6cd

…tion

Merge remote-tracking branch 'origin/main' into fix-direct-arg-comple…

1f0cad0

…tion # Conflicts: # src/services/stringCompletions.ts

andrewbranch approved these changes Jun 13, 2023

View reviewed changes

andrewbranch merged commit c565827 into microsoft:main Jun 13, 2023

Andarist mentioned this pull request Aug 28, 2023

Fixed a string completions regression when requested directly in argument position #55552

Merged

rbuckton mentioned this pull request Aug 31, 2023

Include source node inferences in string literal completions #54121

Merged

Andarist mentioned this pull request Sep 25, 2023

Remove CheckMode.IsForStringLiteralArgumentCompletions #55867

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed some string literal argument completions depending on resolved signature #53996

Fixed some string literal argument completions depending on resolved signature #53996

Andarist commented Apr 24, 2023 •

edited

Loading

Andarist Apr 24, 2023

Andarist Apr 24, 2023 •

edited

Loading

Andarist Apr 24, 2023

Andarist Apr 24, 2023

Andarist Apr 24, 2023

Andarist Apr 24, 2023 •

edited

Loading

jakebailey commented May 3, 2023

typescript-bot commented May 3, 2023 •

edited

Loading

typescript-bot commented May 3, 2023 •

edited

Loading

Fixed some string literal argument completions depending on resolved signature #53996

Fixed some string literal argument completions depending on resolved signature #53996

Conversation

Andarist commented Apr 24, 2023 • edited Loading

Andarist Apr 24, 2023

Choose a reason for hiding this comment

Andarist Apr 24, 2023 • edited Loading

Choose a reason for hiding this comment

Andarist Apr 24, 2023

Choose a reason for hiding this comment

Andarist Apr 24, 2023

Choose a reason for hiding this comment

Andarist Apr 24, 2023

Choose a reason for hiding this comment

Andarist Apr 24, 2023 • edited Loading

Choose a reason for hiding this comment

jakebailey commented May 3, 2023

typescript-bot commented May 3, 2023 • edited Loading

typescript-bot commented May 3, 2023 • edited Loading

Andarist commented Apr 24, 2023 •

edited

Loading

Andarist Apr 24, 2023 •

edited

Loading

Andarist Apr 24, 2023 •

edited

Loading

typescript-bot commented May 3, 2023 •

edited

Loading

typescript-bot commented May 3, 2023 •

edited

Loading