From 122cb0a15b1a673598dfd52b91154d3d58e46c0c Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 16 Feb 2021 19:31:19 +0000 Subject: [PATCH] Cherry-pick PR #42779 into release-4.2 Component commits: 214ef0c750 No did-you-mean-to-call error on casts I chose to do the ad-hoc check rather than yet another tree walk. 1. It's faster to run and easier to read. 2. This error came from looking at real code. It happened twice, so I think the best estimate for other uses that happened zero times is in fact zero. 3. I couldn't think of other places to put the cast, given the restrictions on `testedNode` just before the new code. 1d347785de Merge branch 'master' into no-did-you-mean-to-call-error-on-casts b3be79ad0f Skip parentheses 2a288127e9 Merge branch 'master' into no-did-you-mean-to-call-error-on-casts --- src/compiler/checker.ts | 4 +--- .../truthinessCallExpressionCoercion3.js | 10 ++++++++++ .../truthinessCallExpressionCoercion3.symbols | 14 ++++++++++++++ .../truthinessCallExpressionCoercion3.types | 16 ++++++++++++++++ .../truthinessCallExpressionCoercion3.ts | 5 +++++ 5 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4baec04d9967e..6ea2bc0dcefb0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -34543,9 +34543,7 @@ namespace ts { : isBinaryExpression(location) && isIdentifier(location.right) ? location.right : undefined; const isPropertyExpressionCast = isPropertyAccessExpression(location) - && isParenthesizedExpression(location.expression) - && isAssertionExpression(location.expression.expression); - + && isAssertionExpression(skipParentheses(location.expression)); if (!testedNode || isPropertyExpressionCast) { return; } diff --git a/tests/baselines/reference/truthinessCallExpressionCoercion3.js b/tests/baselines/reference/truthinessCallExpressionCoercion3.js index a2ab27f21a2ef..7fc1df8ffb574 100644 --- a/tests/baselines/reference/truthinessCallExpressionCoercion3.js +++ b/tests/baselines/reference/truthinessCallExpressionCoercion3.js @@ -9,6 +9,11 @@ function f(result: unknown) { return result } } +function g(result: unknown) { + if (((result as I)).always) { + return result + } +} //// [truthinessCallExpressionCoercion3.js] @@ -17,3 +22,8 @@ function f(result) { return result; } } +function g(result) { + if (result.always) { + return result; + } +} diff --git a/tests/baselines/reference/truthinessCallExpressionCoercion3.symbols b/tests/baselines/reference/truthinessCallExpressionCoercion3.symbols index 35392c06aef0e..e7ed13514df6c 100644 --- a/tests/baselines/reference/truthinessCallExpressionCoercion3.symbols +++ b/tests/baselines/reference/truthinessCallExpressionCoercion3.symbols @@ -21,4 +21,18 @@ function f(result: unknown) { >result : Symbol(result, Decl(truthinessCallExpressionCoercion3.ts, 5, 11)) } } +function g(result: unknown) { +>g : Symbol(g, Decl(truthinessCallExpressionCoercion3.ts, 9, 1)) +>result : Symbol(result, Decl(truthinessCallExpressionCoercion3.ts, 10, 11)) + + if (((result as I)).always) { +>((result as I)).always : Symbol(I.always, Decl(truthinessCallExpressionCoercion3.ts, 1, 13)) +>result : Symbol(result, Decl(truthinessCallExpressionCoercion3.ts, 10, 11)) +>I : Symbol(I, Decl(truthinessCallExpressionCoercion3.ts, 0, 0)) +>always : Symbol(I.always, Decl(truthinessCallExpressionCoercion3.ts, 1, 13)) + + return result +>result : Symbol(result, Decl(truthinessCallExpressionCoercion3.ts, 10, 11)) + } +} diff --git a/tests/baselines/reference/truthinessCallExpressionCoercion3.types b/tests/baselines/reference/truthinessCallExpressionCoercion3.types index 200ddbfa13ecc..3d10a48a7f68e 100644 --- a/tests/baselines/reference/truthinessCallExpressionCoercion3.types +++ b/tests/baselines/reference/truthinessCallExpressionCoercion3.types @@ -20,4 +20,20 @@ function f(result: unknown) { >result : unknown } } +function g(result: unknown) { +>g : (result: unknown) => unknown +>result : unknown + + if (((result as I)).always) { +>((result as I)).always : () => void +>((result as I)) : I +>(result as I) : I +>result as I : I +>result : unknown +>always : () => void + + return result +>result : unknown + } +} diff --git a/tests/cases/compiler/truthinessCallExpressionCoercion3.ts b/tests/cases/compiler/truthinessCallExpressionCoercion3.ts index 69f6ba8214d40..948e8059cf14a 100644 --- a/tests/cases/compiler/truthinessCallExpressionCoercion3.ts +++ b/tests/cases/compiler/truthinessCallExpressionCoercion3.ts @@ -11,3 +11,8 @@ function f(result: unknown) { return result } } +function g(result: unknown) { + if (((result as I)).always) { + return result + } +}