Skip to content

Commit 0c58ede

Browse files
a-tarasyuka-tarasyuk
authored
feat(26217): Add missing member fix should work for missing function (#41215)
* feat(26217): Add missing function declaration QF * use codeFixAvailable instead of codeFix * add diagnostics messages 'Method not implemented.' and 'Function not implemented.' * use codeFixAvailable instead of codeFix * fix signature types
1 parent 66ba15a commit 0c58ede

28 files changed

Lines changed: 590 additions & 76 deletions

‎src/compiler/diagnosticMessages.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6195,6 +6195,23 @@
61956195
"category": "Message",
61966196
"code": 95155
61976197
},
6198+
"Add missing function declaration '{0}'": {
6199+
"category": "Message",
6200+
"code": 95156
6201+
},
6202+
"Add all missing function declarations": {
6203+
"category": "Message",
6204+
"code": 95157
6205+
},
6206+
"Method not implemented.": {
6207+
"category": "Message",
6208+
"code": 95158
6209+
},
6210+
"Function not implemented.": {
6211+
"category": "Message",
6212+
"code": 95159
6213+
},
6214+
61986215

61996216
"No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": {
62006217
"category": "Error",

‎src/services/codefixes/fixAddMissingMember.ts‎

Lines changed: 97 additions & 42 deletions
Large diffs are not rendered by default.

‎src/services/codefixes/helpers.ts‎

Lines changed: 58 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -247,41 +247,69 @@ namespace ts.codefix {
247247
);
248248
}
249249

250-
export function createMethodFromCallExpression(
250+
export function createSignatureDeclarationFromCallExpression(
251+
kind: SyntaxKind.MethodDeclaration | SyntaxKind.FunctionDeclaration,
251252
context: CodeFixContextBase,
252253
importAdder: ImportAdder,
253254
call: CallExpression,
254-
methodName: string,
255+
name: Identifier,
255256
modifierFlags: ModifierFlags,
256-
contextNode: Node,
257-
inJs: boolean
258-
): MethodDeclaration {
259-
const body = !isInterfaceDeclaration(contextNode);
260-
const { typeArguments, arguments: args, parent } = call;
257+
contextNode: Node
258+
) {
259+
const quotePreference = getQuotePreference(context.sourceFile, context.preferences);
261260
const scriptTarget = getEmitScriptTarget(context.program.getCompilerOptions());
262-
const checker = context.program.getTypeChecker();
263261
const tracker = getNoopSymbolTrackerWithResolver(context);
264-
const types = map(args, arg =>
265-
typeToAutoImportableTypeNode(checker, importAdder, checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(arg)), contextNode, scriptTarget, /*flags*/ undefined, tracker));
262+
const checker = context.program.getTypeChecker();
263+
const isJs = isInJSFile(contextNode);
264+
const { typeArguments, arguments: args, parent } = call;
265+
266+
const contextualType = isJs ? undefined : checker.getContextualType(call);
266267
const names = map(args, arg =>
267268
isIdentifier(arg) ? arg.text : isPropertyAccessExpression(arg) && isIdentifier(arg.name) ? arg.name.text : undefined);
268-
const contextualType = checker.getContextualType(call);
269-
const returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
270-
const quotePreference = getQuotePreference(context.sourceFile, context.preferences);
271-
return factory.createMethodDeclaration(
269+
const types = isJs ? [] : map(args, arg =>
270+
typeToAutoImportableTypeNode(checker, importAdder, checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(arg)), contextNode, scriptTarget, /*flags*/ undefined, tracker));
271+
272+
const modifiers = modifierFlags
273+
? factory.createNodeArray(factory.createModifiersFromModifierFlags(modifierFlags))
274+
: undefined;
275+
const asteriskToken = isYieldExpression(parent)
276+
? factory.createToken(SyntaxKind.AsteriskToken)
277+
: undefined;
278+
const typeParameters = isJs || typeArguments === undefined
279+
? undefined
280+
: map(typeArguments, (_, i) =>
281+
factory.createTypeParameterDeclaration(CharacterCodes.T + typeArguments.length - 1 <= CharacterCodes.Z ? String.fromCharCode(CharacterCodes.T + i) : `T${i}`));
282+
const parameters = createDummyParameters(args.length, names, types, /*minArgumentCount*/ undefined, isJs);
283+
const type = isJs || contextualType === undefined
284+
? undefined
285+
: checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
286+
287+
if (kind === SyntaxKind.MethodDeclaration) {
288+
return factory.createMethodDeclaration(
289+
/*decorators*/ undefined,
290+
modifiers,
291+
asteriskToken,
292+
name,
293+
/*questionToken*/ undefined,
294+
typeParameters,
295+
parameters,
296+
type,
297+
isInterfaceDeclaration(contextNode) ? undefined : createStubbedMethodBody(quotePreference)
298+
);
299+
}
300+
return factory.createFunctionDeclaration(
272301
/*decorators*/ undefined,
273-
/*modifiers*/ modifierFlags ? factory.createNodeArray(factory.createModifiersFromModifierFlags(modifierFlags)) : undefined,
274-
/*asteriskToken*/ isYieldExpression(parent) ? factory.createToken(SyntaxKind.AsteriskToken) : undefined,
275-
methodName,
276-
/*questionToken*/ undefined,
277-
/*typeParameters*/ inJs ? undefined : map(typeArguments, (_, i) =>
278-
factory.createTypeParameterDeclaration(CharacterCodes.T + typeArguments!.length - 1 <= CharacterCodes.Z ? String.fromCharCode(CharacterCodes.T + i) : `T${i}`)),
279-
/*parameters*/ createDummyParameters(args.length, names, types, /*minArgumentCount*/ undefined, inJs),
280-
/*type*/ returnType,
281-
body ? createStubbedMethodBody(quotePreference) : undefined);
302+
modifiers,
303+
asteriskToken,
304+
name,
305+
typeParameters,
306+
parameters,
307+
type,
308+
createStubbedBody(Diagnostics.Function_not_implemented.message, quotePreference)
309+
);
282310
}
283311

284-
export function typeToAutoImportableTypeNode(checker: TypeChecker, importAdder: ImportAdder, type: Type, contextNode: Node, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, tracker?: SymbolTracker): TypeNode | undefined {
312+
export function typeToAutoImportableTypeNode(checker: TypeChecker, importAdder: ImportAdder, type: Type, contextNode: Node | undefined, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, tracker?: SymbolTracker): TypeNode | undefined {
285313
const typeNode = checker.typeToTypeNode(type, contextNode, flags, tracker);
286314
if (typeNode && isImportTypeNode(typeNode)) {
287315
const importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget);
@@ -381,14 +409,18 @@ namespace ts.codefix {
381409
createStubbedMethodBody(quotePreference));
382410
}
383411

384-
function createStubbedMethodBody(quotePreference: QuotePreference): Block {
412+
function createStubbedMethodBody(quotePreference: QuotePreference) {
413+
return createStubbedBody(Diagnostics.Method_not_implemented.message, quotePreference);
414+
}
415+
416+
export function createStubbedBody(text: string, quotePreference: QuotePreference): Block {
385417
return factory.createBlock(
386418
[factory.createThrowStatement(
387419
factory.createNewExpression(
388420
factory.createIdentifier("Error"),
389421
/*typeArguments*/ undefined,
390422
// TODO Handle auto quote preference.
391-
[factory.createStringLiteral("Method not implemented.", /*isSingleQuote*/ quotePreference === QuotePreference.Single)]))],
423+
[factory.createStringLiteral(text, /*isSingleQuote*/ quotePreference === QuotePreference.Single)]))],
392424
/*multiline*/ true);
393425
}
394426

‎tests/cases/fourslash/codeFixAddMissingConstToArrayDestructuring4.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,14 @@
22

33
////[x, y()] = [0, () => 1];
44

5-
verify.not.codeFixAvailable();
5+
verify.codeFix({
6+
index: 0,
7+
description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "y"],
8+
newFileContent:
9+
`[x, y()] = [0, () => 1];
10+
11+
function y() {
12+
throw new Error("Function not implemented.");
13+
}
14+
`
15+
});

‎tests/cases/fourslash/codeFixAddMissingFunctionDeclaration1.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////foo();
4+
5+
verify.codeFix({
6+
index: 0,
7+
description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "foo"],
8+
newFileContent:
9+
`foo();
10+
11+
function foo() {
12+
throw new Error("Function not implemented.");
13+
}
14+
`
15+
});

‎tests/cases/fourslash/codeFixAddMissingFunctionDeclaration10.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////namespace Foo {
4+
//// export const x = 0;
5+
////}
6+
////
7+
////Foo.test<string, number>();
8+
9+
verify.codeFix({
10+
index: 0,
11+
description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "test"],
12+
newFileContent:
13+
`namespace Foo {
14+
export const x = 0;
15+
16+
export function test<T, U>() {
17+
throw new Error("Function not implemented.");
18+
}
19+
}
20+
21+
Foo.test<string, number>();`
22+
});

‎tests/cases/fourslash/codeFixAddMissingFunctionDeclaration11.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
// @filename: /test.ts
4+
////export const x = 1;
5+
6+
// @filename: /foo.ts
7+
////import * as test from "./test";
8+
////test.foo();
9+
10+
goTo.file("/foo.ts");
11+
verify.codeFix({
12+
index: 0,
13+
description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "foo"],
14+
newFileContent: {
15+
"/test.ts":
16+
`export const x = 1;
17+
18+
export function foo() {
19+
throw new Error("Function not implemented.");
20+
}
21+
`
22+
}
23+
});

‎tests/cases/fourslash/codeFixAddMissingFunctionDeclaration12.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
// @filename: /test.ts
4+
////export const x = 1;
5+
6+
// @filename: /foo.ts
7+
////import * as test from "./test";
8+
////test.foo();
9+
////test.foo();
10+
////test.foo();
11+
12+
goTo.file("/foo.ts");
13+
verify.codeFix({
14+
index: 0,
15+
description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "foo"],
16+
applyChanges: true,
17+
newFileContent: {
18+
"/test.ts":
19+
`export const x = 1;
20+
21+
export function foo() {
22+
throw new Error("Function not implemented.");
23+
}
24+
`
25+
}
26+
});
27+
28+
verify.not.codeFixAvailable();

‎tests/cases/fourslash/codeFixAddMissingFunctionDeclaration13.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
// @filename: /test.ts
4+
////export const x = 1;
5+
6+
// @filename: /foo.ts
7+
////import * as test from "./test";
8+
////test.foo(1, "", { x: 1, y: 1 });
9+
10+
goTo.file("/foo.ts");
11+
verify.codeFix({
12+
index: 0,
13+
description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "foo"],
14+
newFileContent: {
15+
"/test.ts":
16+
`export const x = 1;
17+
18+
export function foo(arg0: number, arg1: string, arg2: { x: number; y: number; }) {
19+
throw new Error("Function not implemented.");
20+
}
21+
`
22+
}
23+
});

‎tests/cases/fourslash/codeFixAddMissingFunctionDeclaration14.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
// @filename: /test.ts
4+
////export const x = 1;
5+
6+
// @filename: /foo.ts
7+
////import * as test from "./test";
8+
////const foo: string = test.foo();
9+
10+
goTo.file("/foo.ts");
11+
verify.codeFix({
12+
index: 0,
13+
description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "foo"],
14+
newFileContent: {
15+
"/test.ts":
16+
`export const x = 1;
17+
18+
export function foo(): string {
19+
throw new Error("Function not implemented.");
20+
}
21+
`
22+
}
23+
});

0 commit comments

Comments
 (0)