Skip to content

fix(51920): "Add missing members" quick fixes incorrectly add TypeScript types in JavaScript files #51922

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
merged 1 commit into from
Dec 16, 2022
Merged

fix(51920): "Add missing members" quick fixes incorrectly add TypeScript types in JavaScript files #51922

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
17 changes: 10 additions & 7 deletions src/services/codefixes/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ export function createSignatureDeclarationFromSignature(
const program = context.program;
const checker = program.getTypeChecker();
const scriptTarget = getEmitScriptTarget(program.getCompilerOptions());
const isJs = isInJSFile(enclosingDeclaration);
const flags =
NodeBuilderFlags.NoTruncation
| NodeBuilderFlags.SuppressAnyReturnType
Expand All @@ -351,9 +352,9 @@ export function createSignatureDeclarationFromSignature(
return undefined;
}

let typeParameters = signatureDeclaration.typeParameters;
let typeParameters = isJs ? undefined : signatureDeclaration.typeParameters;
let parameters = signatureDeclaration.parameters;
let type = signatureDeclaration.type;
let type = isJs ? undefined : signatureDeclaration.type;
if (importAdder) {
if (typeParameters) {
const newTypeParameters = sameMap(typeParameters, typeParameterDecl => {
Expand Down Expand Up @@ -386,11 +387,13 @@ export function createSignatureDeclarationFromSignature(
}
}
const newParameters = sameMap(parameters, parameterDecl => {
const importableReference = tryGetAutoImportableReferenceFromTypeNode(parameterDecl.type, scriptTarget);
let type = parameterDecl.type;
if (importableReference) {
type = importableReference.typeNode;
importSymbols(importAdder, importableReference.symbols);
let type = isJs ? undefined : parameterDecl.type;
if (type) {
const importableReference = tryGetAutoImportableReferenceFromTypeNode(type, scriptTarget);
if (importableReference) {
type = importableReference.typeNode;
importSymbols(importAdder, importableReference.symbols);
}
}
return factory.updateParameterDeclaration(
parameterDecl,
Expand Down
20 changes: 20 additions & 0 deletions tests/cases/fourslash/codeFixAddMissingProperties25.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/// <reference path="fourslash.ts" />

// @allowJs: true
// @checkJs: true
// @filename: /a.js
/////**
//// * @type {{ f: (x: string) => number }}
//// */
////[|export const foo = {}|]

verify.codeFix({
index: 0,
description: ts.Diagnostics.Add_missing_properties.message,
newRangeContent:
`export const foo = {
f: function(x) {
throw new Error("Function not implemented.");
}
}`,
});