Skip to content

Commit 61f6005

Browse files
jtbandesjtbandes
committed
Better error message for accidental calls to get-accessors
1 parent eb105ef commit 61f6005

9 files changed

+111
-6
lines changed

‎src/compiler/checker.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25851,14 +25851,21 @@ namespace ts {
2585125851
error(node, Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new, typeToString(funcType));
2585225852
}
2585325853
else {
25854-
let relatedInformation: DiagnosticRelatedInformation | undefined;
25855-
if (node.arguments.length === 1) {
25854+
const relatedInformation: DiagnosticRelatedInformation[] = [];
25855+
if (node.arguments.length === 0) {
25856+
// Diagnose get accessors incorrectly called as functions
25857+
const { resolvedSymbol } = getNodeLinks(node.expression);
25858+
if (resolvedSymbol && resolvedSymbol.flags & SymbolFlags.GetAccessor) {
25859+
relatedInformation.push(createDiagnosticForNode(node.expression, Diagnostics._0_is_a_get_accessor_did_you_mean_to_use_it_without, getTextOfNode(node.expression)));
25860+
}
25861+
}
25862+
else if (node.arguments.length === 1) {
2585625863
const text = getSourceFileOfNode(node).text;
2585725864
if (isLineBreak(text.charCodeAt(skipTrivia(text, node.expression.end, /* stopAfterLineBreak */ true) - 1))) {
25858-
relatedInformation = createDiagnosticForNode(node.expression, Diagnostics.Are_you_missing_a_semicolon);
25865+
relatedInformation.push(createDiagnosticForNode(node.expression, Diagnostics.Are_you_missing_a_semicolon));
2585925866
}
2586025867
}
25861-
invocationError(node.expression, apparentType, SignatureKind.Call, relatedInformation);
25868+
invocationError(node.expression, apparentType, SignatureKind.Call, ...relatedInformation);
2586225869
}
2586325870
return resolveErrorCall(node);
2586425871
}
@@ -26126,7 +26133,7 @@ namespace ts {
2612626133
relatedMessage: maybeMissingAwait ? Diagnostics.Did_you_forget_to_use_await : undefined,
2612726134
};
2612826135
}
26129-
function invocationError(errorTarget: Node, apparentType: Type, kind: SignatureKind, relatedInformation?: DiagnosticRelatedInformation) {
26136+
function invocationError(errorTarget: Node, apparentType: Type, kind: SignatureKind, ...relatedInformation: DiagnosticRelatedInformation[]) {
2613026137
const { messageChain, relatedMessage: relatedInfo } = invocationErrorDetails(apparentType, kind);
2613126138
const diagnostic = createDiagnosticForNodeFromMessageChain(errorTarget, messageChain);
2613226139
if (relatedInfo) {
@@ -26138,7 +26145,7 @@ namespace ts {
2613826145
diagnostic.length = length;
2613926146
}
2614026147
diagnostics.add(diagnostic);
26141-
invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
26148+
invocationErrorRecovery(apparentType, kind, addRelatedInfo(diagnostic, ...relatedInformation));
2614226149
}
2614326150

2614426151
function invocationErrorRecovery(apparentType: Type, kind: SignatureKind, diagnostic: Diagnostic) {

‎src/compiler/diagnosticMessages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4384,6 +4384,10 @@
43844384
"category": "Error",
43854385
"code": 6231
43864386
},
4387+
"'{0}' is a 'get' accessor; did you mean to use it without '()'?": {
4388+
"category": "Message",
4389+
"code": 6232
4390+
},
43874391

43884392
"Projects to reference": {
43894393
"category": "Message",

‎tests/baselines/reference/accessorAccidentalCallDiagnostic.errors.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
tests/cases/compiler/accessorAccidentalCallDiagnostic.ts(6,14): error TS2349: This expression is not callable.
2+
Type 'Number' has no call signatures.
3+
4+
5+
==== tests/cases/compiler/accessorAccidentalCallDiagnostic.ts (1 errors) ====
6+
// https://github.com/microsoft/TypeScript/issues/24554
7+
class Test24554 {
8+
get property(): number { return 1; }
9+
}
10+
function test24554(x: Test24554) {
11+
return x.property();
12+
~~~~~~~~
13+
!!! error TS2349: This expression is not callable.
14+
!!! error TS2349: Type 'Number' has no call signatures.
15+
!!! related TS6232 tests/cases/compiler/accessorAccidentalCallDiagnostic.ts:6:12: 'x.property' is a 'get' accessor; did you mean to use it without '()'?
16+
}
17+

‎tests/baselines/reference/accessorAccidentalCallDiagnostic.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//// [accessorAccidentalCallDiagnostic.ts]
2+
// https://github.com/microsoft/TypeScript/issues/24554
3+
class Test24554 {
4+
get property(): number { return 1; }
5+
}
6+
function test24554(x: Test24554) {
7+
return x.property();
8+
}
9+
10+
11+
//// [accessorAccidentalCallDiagnostic.js]
12+
// https://github.com/microsoft/TypeScript/issues/24554
13+
var Test24554 = /** @class */ (function () {
14+
function Test24554() {
15+
}
16+
Object.defineProperty(Test24554.prototype, "property", {
17+
get: function () { return 1; },
18+
enumerable: false,
19+
configurable: true
20+
});
21+
return Test24554;
22+
}());
23+
function test24554(x) {
24+
return x.property();
25+
}

‎tests/baselines/reference/accessorAccidentalCallDiagnostic.symbols

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
=== tests/cases/compiler/accessorAccidentalCallDiagnostic.ts ===
2+
// https://github.com/microsoft/TypeScript/issues/24554
3+
class Test24554 {
4+
>Test24554 : Symbol(Test24554, Decl(accessorAccidentalCallDiagnostic.ts, 0, 0))
5+
6+
get property(): number { return 1; }
7+
>property : Symbol(Test24554.property, Decl(accessorAccidentalCallDiagnostic.ts, 1, 17))
8+
}
9+
function test24554(x: Test24554) {
10+
>test24554 : Symbol(test24554, Decl(accessorAccidentalCallDiagnostic.ts, 3, 1))
11+
>x : Symbol(x, Decl(accessorAccidentalCallDiagnostic.ts, 4, 19))
12+
>Test24554 : Symbol(Test24554, Decl(accessorAccidentalCallDiagnostic.ts, 0, 0))
13+
14+
return x.property();
15+
>x.property : Symbol(Test24554.property, Decl(accessorAccidentalCallDiagnostic.ts, 1, 17))
16+
>x : Symbol(x, Decl(accessorAccidentalCallDiagnostic.ts, 4, 19))
17+
>property : Symbol(Test24554.property, Decl(accessorAccidentalCallDiagnostic.ts, 1, 17))
18+
}
19+

‎tests/baselines/reference/accessorAccidentalCallDiagnostic.types

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
=== tests/cases/compiler/accessorAccidentalCallDiagnostic.ts ===
2+
// https://github.com/microsoft/TypeScript/issues/24554
3+
class Test24554 {
4+
>Test24554 : Test24554
5+
6+
get property(): number { return 1; }
7+
>property : number
8+
>1 : 1
9+
}
10+
function test24554(x: Test24554) {
11+
>test24554 : (x: Test24554) => any
12+
>x : Test24554
13+
14+
return x.property();
15+
>x.property() : any
16+
>x.property : number
17+
>x : Test24554
18+
>property : number
19+
}
20+

‎tests/baselines/reference/instancePropertiesInheritedIntoClassType.errors.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIn
3535
~
3636
!!! error TS2349: This expression is not callable.
3737
!!! error TS2349: Type 'Number' has no call signatures.
38+
!!! related TS6232 tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts:19:14: 'd.y' is a 'get' accessor; did you mean to use it without '()'?
3839

3940
}
4041

@@ -64,4 +65,5 @@ tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIn
6465
~
6566
!!! error TS2349: This expression is not callable.
6667
!!! error TS2349: Type 'String' has no call signatures.
68+
!!! related TS6232 tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts:41:14: 'd.y' is a 'get' accessor; did you mean to use it without '()'?
6769
}

‎tests/baselines/reference/instancePropertyInClassType.errors.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.t
3333
~
3434
!!! error TS2349: This expression is not callable.
3535
!!! error TS2349: Type 'Number' has no call signatures.
36+
!!! related TS6232 tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts:17:14: 'c.y' is a 'get' accessor; did you mean to use it without '()'?
3637

3738
}
3839

@@ -60,4 +61,5 @@ tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.t
6061
~
6162
!!! error TS2349: This expression is not callable.
6263
!!! error TS2349: Type 'String' has no call signatures.
64+
!!! related TS6232 tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts:37:14: 'c.y' is a 'get' accessor; did you mean to use it without '()'?
6365
}

‎tests/cases/compiler/accessorAccidentalCallDiagnostic.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// @target: es5
2+
3+
// https://github.com/microsoft/TypeScript/issues/24554
4+
class Test24554 {
5+
get property(): number { return 1; }
6+
}
7+
function test24554(x: Test24554) {
8+
return x.property();
9+
}

0 commit comments

Comments
 (0)