improve test case and add related diagnostic

Kingwl · Kingwl · commit 2cf2bbd5f77a · 2018-09-11T16:20:38.000+08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -19655,14 +19655,14 @@ namespace ts {
                     error(node, Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new, typeToString(funcType));
                 }
                 else {
+                    let relatedInformation: DiagnosticRelatedInformation | undefined;
                     if (node.arguments.length === 1 && isTypeAssertion(first(node.arguments))) {
                         const text = getSourceFileOfNode(node).text;
-                        const pos = skipTrivia(text, node.expression.end, /* stepAfterLineBreak */ true) - 1;
-                        if (isLineBreak(text.charCodeAt(pos))) {
-                            error(node.expression, Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
+                        if (isLineBreak(text.charCodeAt(skipTrivia(text, node.expression.end, /* stopAfterLineBreak */ true) - 1))) {
+                            relatedInformation = createDiagnosticForNode(node.expression, Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
                         }
                     }
-                    invocationError(node, apparentType, SignatureKind.Call);
+                    invocationError(node, apparentType, SignatureKind.Call, relatedInformation);
                 }
                 return resolveErrorCall(node);
             }
@@ -19832,11 +19832,12 @@ namespace ts {
             return true;
         }
 
-        function invocationError(node: Node, apparentType: Type, kind: SignatureKind) {
-            invocationErrorRecovery(apparentType, kind, error(node, kind === SignatureKind.Call
-                ? Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures
-                : Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature
-            , typeToString(apparentType)));
+        function invocationError(node: Node, apparentType: Type, kind: SignatureKind, relatedInformation?: DiagnosticRelatedInformation) {
+            const diagnostic = error(node, (kind === SignatureKind.Call ?
+                Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
+                Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature
+            ), typeToString(apparentType));
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
 
         function invocationErrorRecovery(apparentType: Type, kind: SignatureKind, diagnostic: Diagnostic) {
diff --git a/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.errors.txt b/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.errors.txt
@@ -1,12 +1,11 @@
 tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts(3,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
 tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts(5,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
-tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts(7,1): error TS2734: It is highly likely that you are missing a semicolon.
 tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts(7,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
-tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts(10,1): error TS2734: It is highly likely that you are missing a semicolon.
 tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts(10,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
+tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts(13,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
 
 
-==== tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts (6 errors) ====
+==== tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts (5 errors) ====
     declare function foo(): string;
     
     foo()(1 as number).toString();
@@ -19,17 +18,22 @@ tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.t
     
     foo()
     ~~~~~
-!!! error TS2734: It is highly likely that you are missing a semicolon.
-    ~~~~~
     (1 as number).toString();
     ~~~~~~~~~~~~~
 !!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
+!!! related TS2734 tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts:7:1: It is highly likely that you are missing a semicolon.
     
     foo()   
-    ~~~~~
-!!! error TS2734: It is highly likely that you are missing a semicolon.
     ~~~~~~~~
         (1 as number).toString();
     ~~~~~~~~~~~~~~~~~
 !!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
+!!! related TS2734 tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts:10:1: It is highly likely that you are missing a semicolon.
+    
+    foo()   
+    ~~~~~~~~
+        (<number>1).toString();
+    ~~~~~~~~~~~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
+!!! related TS2734 tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts:13:1: It is highly likely that you are missing a semicolon.
     
diff --git a/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.js b/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.js
@@ -10,10 +10,14 @@ foo()
 
 foo()   
     (1 as number).toString();
+
+foo()   
+    (<number>1).toString();
 
 
 //// [betterErrorForAccidentallyCallingTypeAssertionExpressions.js]
 foo()(1).toString();
 foo()(1).toString();
 foo()(1).toString();
 foo()(1).toString();
+foo()(1).toString();
diff --git a/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.symbols b/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.symbols
@@ -18,3 +18,8 @@ foo()
 
     (1 as number).toString();
 
+foo()   
+>foo : Symbol(foo, Decl(betterErrorForAccidentallyCallingTypeAssertionExpressions.ts, 0, 0))
+
+    (<number>1).toString();
+
diff --git a/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.types b/tests/baselines/reference/betterErrorForAccidentallyCallingTypeAssertionExpressions.types
@@ -46,3 +46,15 @@ foo()
 >1 : 1
 >toString : any
 
+foo()   
+>foo()       (<number>1).toString() : any
+>foo()       (<number>1).toString : any
+>foo()       (<number>1) : any
+>foo() : string
+>foo : () => string
+
+    (<number>1).toString();
+><number>1 : number
+>1 : 1
+>toString : any
+
diff --git a/tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts b/tests/cases/compiler/betterErrorForAccidentallyCallingTypeAssertionExpressions.ts
@@ -9,3 +9,6 @@ foo()
 
 foo()   
     (1 as number).toString();
+
+foo()   
+    (<number>1).toString();

Original file line number	Diff line number	Diff line change
`@@ -19655,14 +19655,14 @@ namespace ts {`
`19655`	`19655`	`error(node, Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new, typeToString(funcType));`
`19656`	`19656`	`}`
`19657`	`19657`	`else {`
	`19658`	`+ let relatedInformation: DiagnosticRelatedInformation \| undefined;`
`19658`	`19659`	`if (node.arguments.length === 1 && isTypeAssertion(first(node.arguments))) {`
`19659`	`19660`	`const text = getSourceFileOfNode(node).text;`
`19660`		`- const pos = skipTrivia(text, node.expression.end, /* stepAfterLineBreak */ true) - 1;`
`19661`		`- if (isLineBreak(text.charCodeAt(pos))) {`
`19662`		`- error(node.expression, Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);`
	`19661`	`+ if (isLineBreak(text.charCodeAt(skipTrivia(text, node.expression.end, /* stopAfterLineBreak */ true) - 1))) {`
	`19662`	`+ relatedInformation = createDiagnosticForNode(node.expression, Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);`
`19663`	`19663`	`}`
`19664`	`19664`	`}`
`19665`		`- invocationError(node, apparentType, SignatureKind.Call);`
	`19665`	`+ invocationError(node, apparentType, SignatureKind.Call, relatedInformation);`
`19666`	`19666`	`}`
`19667`	`19667`	`return resolveErrorCall(node);`
`19668`	`19668`	`}`
`@@ -19832,11 +19832,12 @@ namespace ts {`
`19832`	`19832`	`return true;`
`19833`	`19833`	`}`
`19834`	`19834`
`19835`		`- function invocationError(node: Node, apparentType: Type, kind: SignatureKind) {`
`19836`		`- invocationErrorRecovery(apparentType, kind, error(node, kind === SignatureKind.Call`
`19837`		`- ? Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures`
`19838`		`- : Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature`
`19839`		`- , typeToString(apparentType)));`
	`19835`	`+ function invocationError(node: Node, apparentType: Type, kind: SignatureKind, relatedInformation?: DiagnosticRelatedInformation) {`
	`19836`	`+ const diagnostic = error(node, (kind === SignatureKind.Call ?`
	`19837`	`+ Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :`
	`19838`	`+ Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature`
	`19839`	`+ ), typeToString(apparentType));`
	`19840`	`+ invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);`
`19840`	`19841`	`}`
`19841`	`19842`
`19842`	`19843`	`function invocationErrorRecovery(apparentType: Type, kind: SignatureKind, diagnostic: Diagnostic) {`