microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(45102): do not suggest refactoring for functions contains arguments reference (#45116)

Browse Source
This commit is contained in:
Oleksandr T 2021-08-03 21:31:56 +03:00 committed by GitHub
parent 5a2153a729
commit c4080437b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/checker.ts
View File

@ -555,6 +555,7 @@ namespace ts {
getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, CheckMode.IsForSignatureHelp),
getExpandedParameters,
hasEffectiveRestParameter,
containsArgumentsReference,
getConstantValue: nodeIn => {
const node = getParseTreeNode(nodeIn, canHaveConstantValue);
return node ? getConstantValue(node) : undefined;

2
src/compiler/types.ts
View File

@ -4205,6 +4205,8 @@ namespace ts {
/* @internal */ getResolvedSignatureForSignatureHelp(node: CallLikeExpression, candidatesOutArray?: Signature[], argumentCount?: number): Signature | undefined;
/* @internal */ getExpandedParameters(sig: Signature): readonly (readonly Symbol[])[];
/* @internal */ hasEffectiveRestParameter(sig: Signature): boolean;
/* @internal */ containsArgumentsReference(declaration: SignatureDeclaration): boolean;
getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature | undefined;
isImplementationOfOverload(node: SignatureDeclaration): boolean | undefined;
isUndefinedSymbol(symbol: Symbol): boolean;

5
src/services/refactors/convertArrowFunctionOrFunctionExpression.ts
View File

@ -141,7 +141,7 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
const token = getTokenAtPosition(file, startPosition);
const typeChecker = program.getTypeChecker();
const func = tryGetFunctionFromVariableDeclaration(file, typeChecker, token.parent);
if (func && !containingThis(func.body)) {
if (func && !containingThis(func.body) && !typeChecker.containsArgumentsReference(func)) {
return { selectedVariableDeclaration: true, func };
}
@ -150,7 +150,8 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
maybeFunc &&
(isFunctionExpression(maybeFunc) || isArrowFunction(maybeFunc)) &&
!rangeContainsRange(maybeFunc.body, token) &&
!containingThis(maybeFunc.body)
!containingThis(maybeFunc.body) &&
!typeChecker.containsArgumentsReference(maybeFunc)
) {
if (isFunctionExpression(maybeFunc) && isFunctionReferencedInFile(file, typeChecker, maybeFunc)) return undefined;
return { selectedVariableDeclaration: false, func: maybeFunc };

10
tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Anon_arguments.ts Normal file
View File

@ -0,0 +1,10 @@
/// <reference path='fourslash.ts' />
////function foo() {
//// return /*a*/(/*b*/) => arguments;
////}
goTo.select("a", "b");
verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to named function");
verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to anonymous function");
verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");

10
tests/cases/fourslash/refactorConvertArrowFunctionOrFunctionExpression_Availability_Arrow_arguments.ts Normal file
View File

@ -0,0 +1,10 @@
/// <reference path='fourslash.ts' />
////function foo() {
//// return /*a*/f/*b*/unction () { arguments }
////}
goTo.select("a", "b");
verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to named function");
verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to anonymous function");
verify.not.refactorAvailable("Convert arrow function or function expression", "Convert to arrow function");