diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2cdeaec2cee..44b3b4dc862 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -21354,8 +21354,12 @@ namespace ts {
             return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
 
             function getCallErrorNode(node: CallLikeExpression): Node {
-                if (isCallExpression(node) && isPropertyAccessExpression(node.expression)) {
-                    return node.expression.name;
+                if (isCallExpression(node)) {
+                    if (isPropertyAccessExpression(node.expression)) {
+                        return node.expression.name;
+                    } else {
+                        return node.expression;
+                    }
                 }
                 return node;
             }
diff --git a/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt b/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt
index 788ff30c58f..3ebaaa1004f 100644
--- a/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt
+++ b/tests/baselines/reference/arityErrorRelatedSpanBindingPattern.errors.txt
@@ -8,12 +8,12 @@ tests/cases/compiler/arityErrorRelatedSpanBindingPattern.ts(7,1): error TS2554:
     function bar(a, b, [c]): void {}
     
     foo("", 0);
-    ~~~~~~~~~~
+    ~~~
 !!! error TS2554: Expected 3 arguments, but got 2.
 !!! related TS6211 tests/cases/compiler/arityErrorRelatedSpanBindingPattern.ts:1:20: An argument matching this binding pattern was not provided.
     
     bar("", 0);
-    ~~~~~~~~~~
+    ~~~
 !!! error TS2554: Expected 3 arguments, but got 2.
 !!! related TS6211 tests/cases/compiler/arityErrorRelatedSpanBindingPattern.ts:3:20: An argument matching this binding pattern was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/baseCheck.errors.txt b/tests/baselines/reference/baseCheck.errors.txt
index 67358a10338..359d689e3fe 100644
--- a/tests/baselines/reference/baseCheck.errors.txt
+++ b/tests/baselines/reference/baseCheck.errors.txt
@@ -30,7 +30,7 @@ tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'.
     }
     
     class D extends C { constructor(public z: number) { super(this.z) }  } // too few params
-                                                        ~~~~~~~~~~~~~
+                                                        ~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/compiler/baseCheck.ts:1:34: An argument for 'y' was not provided.
                                                               ~~~~
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt
index 407c1c22a37..96d23c6a304 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt
@@ -33,6 +33,6 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(16,1): error T
     }
     foo(10);
     foo(); // not ok - needs number
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts:1:14: An argument for 'a' was not provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt
index 0a6109ee05f..da0e50d3086 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt
@@ -33,6 +33,6 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(16,1): error T
     }
     foo(10);
     foo(); // not ok - needs number
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts:1:14: An argument for 'a' was not provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
index b6c4ac4c6a5..c8c98c51917 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
@@ -29,12 +29,12 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): e
         }
         foo(10);
         foo(); // not ok - needs number
-        ~~~~~
+        ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts:2:14: An argument for 'a' was not provided.
     }
     foo(10);
     foo(); // not ok - needs number
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts:2:14: An argument for 'a' was not provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt
index d9b81d2686f..963b849ee72 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt
@@ -23,12 +23,12 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(17,1): e
         }
         foo(10);
         foo(); // not ok
-        ~~~~~
+        ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts:2:14: An argument for 'a' was not provided.
     }
     foo(10);
     foo(); // not ok - needs number
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts:2:14: An argument for 'a' was not provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/callOverload.errors.txt b/tests/baselines/reference/callOverload.errors.txt
index 0f6a2ade085..b08bf7ce891 100644
--- a/tests/baselines/reference/callOverload.errors.txt
+++ b/tests/baselines/reference/callOverload.errors.txt
@@ -19,7 +19,7 @@ tests/cases/conformance/expressions/functionCalls/callOverload.ts(11,10): error
 !!! error TS2554: Expected 2 arguments, but got 4.
     withRest('a', ...n); // no error
     withRest();
-    ~~~~~~~~~~
+    ~~~~~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callOverload.ts:3:27: An argument for 'a' was not provided.
     withRest(...n); 
diff --git a/tests/baselines/reference/callWithMissingVoid.errors.txt b/tests/baselines/reference/callWithMissingVoid.errors.txt
index 67d380be662..8b38f53acd4 100644
--- a/tests/baselines/reference/callWithMissingVoid.errors.txt
+++ b/tests/baselines/reference/callWithMissingVoid.errors.txt
@@ -56,15 +56,15 @@ tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts(75,1):
     new MyPromise<void>(resolve => resolve()); // no error
     new MyPromise<void | number>(resolve => resolve()); // no error
     new MyPromise<any>(resolve => resolve()); // error, `any` arguments cannot be omitted
-                                  ~~~~~~~~~
+                                  ~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:28:38: An argument for 'value' was not provided.
     new MyPromise<unknown>(resolve => resolve()); // error, `unknown` arguments cannot be omitted
-                                      ~~~~~~~~~
+                                      ~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:28:38: An argument for 'value' was not provided.
     new MyPromise<never>(resolve => resolve()); // error, `never` arguments cannot be omitted
-                                    ~~~~~~~~~
+                                    ~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:28:38: An argument for 'value' was not provided.
     
@@ -78,7 +78,7 @@ tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts(75,1):
     a(4, "hello"); // ok
     a(4, "hello", void 0); // ok
     a(4); // not ok
-    ~~~~
+    ~
 !!! error TS2554: Expected 3 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:42:23: An argument for 'y' was not provided.
     
@@ -88,15 +88,15 @@ tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts(75,1):
     
     b(4, "hello", void 0, 2); // ok
     b(4, "hello"); // not ok
-    ~~~~~~~~~~~~~
+    ~
 !!! error TS2554: Expected 4 arguments, but got 2.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:50:34: An argument for 'z' was not provided.
     b(4, "hello", void 0); // not ok
-    ~~~~~~~~~~~~~~~~~~~~~
+    ~
 !!! error TS2554: Expected 4 arguments, but got 3.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:50:43: An argument for 'what' was not provided.
     b(4); // not ok
-    ~~~~
+    ~
 !!! error TS2554: Expected 4 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:50:23: An argument for 'y' was not provided.
     
@@ -117,7 +117,7 @@ tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts(75,1):
         ...args: TS): void;
     
     call((x: number, y: number) => x + y) // error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~
 !!! error TS2554: Expected 3 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/expressions/functionCalls/callWithMissingVoid.ts:73:5: An argument for 'args' was not provided.
     call((x: number, y: number) => x + y, 4, 2) // ok
diff --git a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
index 02c5940be14..26b83dc08a6 100644
--- a/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
+++ b/tests/baselines/reference/classCanExtendConstructorFunction.errors.txt
@@ -38,7 +38,7 @@ tests/cases/conformance/salsa/second.ts(17,15): error TS2345: Argument of type '
     class Sql extends Wagon {
         constructor() {
             super(); // error: not enough arguments
-            ~~~~~~~
+            ~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/salsa/first.js:5:16: An argument for 'numberOxen' was not provided.
             this.foonly = 12
diff --git a/tests/baselines/reference/functionCall11.errors.txt b/tests/baselines/reference/functionCall11.errors.txt
index 4fb06f83157..b35a38fd099 100644
--- a/tests/baselines/reference/functionCall11.errors.txt
+++ b/tests/baselines/reference/functionCall11.errors.txt
@@ -8,7 +8,7 @@ tests/cases/compiler/functionCall11.ts(6,15): error TS2554: Expected 1-2 argumen
     foo('foo', 1); 
     foo('foo'); 
     foo();
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionCall11.ts:1:14: An argument for 'a' was not provided.
     foo(1, 'bar');
diff --git a/tests/baselines/reference/functionCall12.errors.txt b/tests/baselines/reference/functionCall12.errors.txt
index 8b6c02b4804..0221a9006b7 100644
--- a/tests/baselines/reference/functionCall12.errors.txt
+++ b/tests/baselines/reference/functionCall12.errors.txt
@@ -8,7 +8,7 @@ tests/cases/compiler/functionCall12.ts(7,15): error TS2345: Argument of type '3'
     foo('foo', 1); 
     foo('foo'); 
     foo();
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1-3 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionCall12.ts:1:14: An argument for 'a' was not provided.
     foo(1, 'bar');
diff --git a/tests/baselines/reference/functionCall13.errors.txt b/tests/baselines/reference/functionCall13.errors.txt
index 8e7b5ecc97a..4717d04f241 100644
--- a/tests/baselines/reference/functionCall13.errors.txt
+++ b/tests/baselines/reference/functionCall13.errors.txt
@@ -7,7 +7,7 @@ tests/cases/compiler/functionCall13.ts(5,5): error TS2345: Argument of type '1'
     foo('foo', 1); 
     foo('foo'); 
     foo();
-    ~~~~~
+    ~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionCall13.ts:1:14: An argument for 'a' was not provided.
     foo(1, 'bar');
diff --git a/tests/baselines/reference/functionCall16.errors.txt b/tests/baselines/reference/functionCall16.errors.txt
index 220e2017b67..15e67bb6b14 100644
--- a/tests/baselines/reference/functionCall16.errors.txt
+++ b/tests/baselines/reference/functionCall16.errors.txt
@@ -11,7 +11,7 @@ tests/cases/compiler/functionCall16.ts(6,5): error TS2345: Argument of type '1'
     foo('foo'); 
     foo('foo', 'bar'); 
     foo();
-    ~~~~~
+    ~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionCall16.ts:1:14: An argument for 'a' was not provided.
     foo(1, 'bar');
diff --git a/tests/baselines/reference/functionCall17.errors.txt b/tests/baselines/reference/functionCall17.errors.txt
index 5d1bfe98edd..8bb5a7e3e17 100644
--- a/tests/baselines/reference/functionCall17.errors.txt
+++ b/tests/baselines/reference/functionCall17.errors.txt
@@ -11,7 +11,7 @@ tests/cases/compiler/functionCall17.ts(6,12): error TS2345: Argument of type '1'
 !!! error TS2345: Argument of type '1' is not assignable to parameter of type 'string'.
     foo('foo'); 
     foo();
-    ~~~~~
+    ~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionCall17.ts:1:14: An argument for 'a' was not provided.
     foo(1, 'bar');
diff --git a/tests/baselines/reference/functionCall18.errors.txt b/tests/baselines/reference/functionCall18.errors.txt
index 1744c76982f..dfd0ab9af4f 100644
--- a/tests/baselines/reference/functionCall18.errors.txt
+++ b/tests/baselines/reference/functionCall18.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/functionCall18.ts(4,1): error TS2554: Expected 2 arguments,
     declare function foo<T>(a: T, b: T);
     declare function foo(a: {});
     foo<string>("hello");
-    ~~~~~~~~~~~~~~~~~~~~
+    ~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/compiler/functionCall18.ts:2:31: An argument for 'b' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionCall6.errors.txt b/tests/baselines/reference/functionCall6.errors.txt
index af3d4a0be22..585c12aa354 100644
--- a/tests/baselines/reference/functionCall6.errors.txt
+++ b/tests/baselines/reference/functionCall6.errors.txt
@@ -13,7 +13,7 @@ tests/cases/compiler/functionCall6.ts(5,1): error TS2554: Expected 1 arguments,
                ~~~~~
 !!! error TS2554: Expected 1 arguments, but got 2.
     foo();
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionCall6.ts:1:14: An argument for 'a' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionCall7.errors.txt b/tests/baselines/reference/functionCall7.errors.txt
index 53a3c575ec3..31d0eb32008 100644
--- a/tests/baselines/reference/functionCall7.errors.txt
+++ b/tests/baselines/reference/functionCall7.errors.txt
@@ -15,7 +15,7 @@ tests/cases/compiler/functionCall7.ts(7,1): error TS2554: Expected 1 arguments,
         ~
 !!! error TS2345: Argument of type '4' is not assignable to parameter of type 'c1'.
     foo();
-    ~~~~~
+    ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionCall7.ts:2:14: An argument for 'a' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads29.errors.txt b/tests/baselines/reference/functionOverloads29.errors.txt
index 908380417f9..3f0fdea31b4 100644
--- a/tests/baselines/reference/functionOverloads29.errors.txt
+++ b/tests/baselines/reference/functionOverloads29.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/functionOverloads29.ts(4,9): error TS2554: Expected 1 argum
     function foo(bar:number):number;
     function foo(bar:any):any{ return bar }
     var x = foo();
-            ~~~~~
+            ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionOverloads29.ts:1:14: An argument for 'bar' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads34.errors.txt b/tests/baselines/reference/functionOverloads34.errors.txt
index 1d032b7c34d..c83981b9159 100644
--- a/tests/baselines/reference/functionOverloads34.errors.txt
+++ b/tests/baselines/reference/functionOverloads34.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/functionOverloads34.ts(4,9): error TS2554: Expected 1 argum
     function foo(bar:{a:boolean;}):number;
     function foo(bar:{a:any;}):any{ return bar }
     var x = foo();
-            ~~~~~
+            ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionOverloads34.ts:1:14: An argument for 'bar' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionOverloads37.errors.txt b/tests/baselines/reference/functionOverloads37.errors.txt
index 9f0ac5ee0e5..7760944cd01 100644
--- a/tests/baselines/reference/functionOverloads37.errors.txt
+++ b/tests/baselines/reference/functionOverloads37.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/functionOverloads37.ts(4,9): error TS2554: Expected 1 argum
     function foo(bar:{a:boolean;}[]):number;
     function foo(bar:{a:any;}[]):any{ return bar }
     var x = foo();
-            ~~~~~
+            ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionOverloads37.ts:1:14: An argument for 'bar' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionParameterArityMismatch.errors.txt b/tests/baselines/reference/functionParameterArityMismatch.errors.txt
index aa870c23028..45533c6a3fa 100644
--- a/tests/baselines/reference/functionParameterArityMismatch.errors.txt
+++ b/tests/baselines/reference/functionParameterArityMismatch.errors.txt
@@ -11,11 +11,11 @@ tests/cases/compiler/functionParameterArityMismatch.ts(14,22): error TS2554: Exp
     declare function f1(a: number);
     declare function f1(a: number, b: number, c: number);
     f1();
-    ~~~~
+    ~~
 !!! error TS2554: Expected 1-3 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/functionParameterArityMismatch.ts:1:21: An argument for 'a' was not provided.
     f1(1, 2);
-    ~~~~~~~~
+    ~~
 !!! error TS2575: No overload expects 2 arguments, but overloads do exist that expect either 1 or 3 arguments.
     f1(1, 2, 3, 4);
                 ~
@@ -26,13 +26,13 @@ tests/cases/compiler/functionParameterArityMismatch.ts(14,22): error TS2554: Exp
     declare function f2(a: number, b: number, c: number, d: number);
     declare function f2(a: number, b: number, c: number, d: number, e: number, f: number);
     f2(1);
-    ~~~~~
+    ~~
 !!! error TS2575: No overload expects 1 arguments, but overloads do exist that expect either 0 or 2 arguments.
     f2(1, 2, 3);
-    ~~~~~~~~~~~
+    ~~
 !!! error TS2575: No overload expects 3 arguments, but overloads do exist that expect either 2 or 4 arguments.
     f2(1, 2, 3, 4, 5);
-    ~~~~~~~~~~~~~~~~~
+    ~~
 !!! error TS2575: No overload expects 5 arguments, but overloads do exist that expect either 4 or 6 arguments.
     f2(1, 2, 3, 4, 5, 6, 7);
                          ~
diff --git a/tests/baselines/reference/genericRestArity.errors.txt b/tests/baselines/reference/genericRestArity.errors.txt
index e9c98c35584..97889f68bd4 100644
--- a/tests/baselines/reference/genericRestArity.errors.txt
+++ b/tests/baselines/reference/genericRestArity.errors.txt
@@ -10,7 +10,7 @@ tests/cases/conformance/types/rest/genericRestArity.ts(8,45): error TS2554: Expe
         ...args: TS): void;
       
     call((x: number, y: number) => x + y);
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~
 !!! error TS2554: Expected 3 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/types/rest/genericRestArity.ts:5:5: An argument for 'args' was not provided.
     call((x: number, y: number) => x + y, 1, 2, 3, 4, 5, 6, 7);
diff --git a/tests/baselines/reference/genericRestArityStrict.errors.txt b/tests/baselines/reference/genericRestArityStrict.errors.txt
index c5fc4e9704f..d91611ab494 100644
--- a/tests/baselines/reference/genericRestArityStrict.errors.txt
+++ b/tests/baselines/reference/genericRestArityStrict.errors.txt
@@ -10,7 +10,7 @@ tests/cases/conformance/types/rest/genericRestArityStrict.ts(8,45): error TS2554
         ...args: TS): void;
       
     call((x: number, y: number) => x + y);
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~
 !!! error TS2554: Expected 3 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/types/rest/genericRestArityStrict.ts:5:5: An argument for 'args' was not provided.
     call((x: number, y: number) => x + y, 1, 2, 3, 4, 5, 6, 7);
diff --git a/tests/baselines/reference/genericRestParameters3.errors.txt b/tests/baselines/reference/genericRestParameters3.errors.txt
index 612140ea940..417338401e3 100644
--- a/tests/baselines/reference/genericRestParameters3.errors.txt
+++ b/tests/baselines/reference/genericRestParameters3.errors.txt
@@ -87,7 +87,7 @@ tests/cases/conformance/types/rest/genericRestParameters3.ts(53,5): error TS2345
     declare function foo<T extends any[]>(cb: (...args: T) => void): void;
     
     foo<CoolArray<any>>();     // Error
-    ~~~~~~~~~~~~~~~~~~~~~
+    ~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/rest/genericRestParameters3.ts:27:39: An argument for 'cb' was not provided.
     foo<CoolArray<any>>(100);  // Error
diff --git a/tests/baselines/reference/iterableArrayPattern25.errors.txt b/tests/baselines/reference/iterableArrayPattern25.errors.txt
index 0161be07d4b..d566c127e43 100644
--- a/tests/baselines/reference/iterableArrayPattern25.errors.txt
+++ b/tests/baselines/reference/iterableArrayPattern25.errors.txt
@@ -4,5 +4,5 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts(2,1): error
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts (1 errors) ====
     function takeFirstTwoEntries(...[[k1, v1], [k2, v2]]) { }
     takeFirstTwoEntries(new Map([["", 0], ["hello", 1]]));
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt
index dda54d6dbe3..23b7c200b83 100644
--- a/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt
+++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt
@@ -14,15 +14,15 @@ tests/cases/compiler/bar.ts(3,1): error TS2554: Expected 3 arguments, but got 2.
     
 ==== tests/cases/compiler/bar.ts (3 errors) ====
     f(); // Error
-    ~~~
+    ~
 !!! error TS2554: Expected 3 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/foo.js:6:12: An argument for 'a' was not provided.
     f(1); // Error
-    ~~~~
+    ~
 !!! error TS2554: Expected 3 arguments, but got 1.
 !!! related TS6210 tests/cases/compiler/foo.js:6:15: An argument for 'b' was not provided.
     f(1, 2); // Error
-    ~~~~~~~
+    ~
 !!! error TS2554: Expected 3 arguments, but got 2.
 !!! related TS6210 tests/cases/compiler/foo.js:6:18: An argument for 'c' was not provided.
     
diff --git a/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt b/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt
index 3658797f87f..270050e0317 100644
--- a/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt
+++ b/tests/baselines/reference/jsdocTypeTagRequiredParameters.errors.txt
@@ -15,15 +15,15 @@ tests/cases/conformance/jsdoc/a.js(13,1): error TS2554: Expected 1 arguments, bu
     }
     
     f() // should error
-    ~~~
+    ~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/jsdoc/a.js:1:21: An argument for '0' was not provided.
     g() // should error
-    ~~~
+    ~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/jsdoc/a.js:5:12: An argument for 's' was not provided.
     h()
-    ~~~
+    ~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/jsdoc/a.js:8:12: An argument for 's' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalParamArgsTest.errors.txt b/tests/baselines/reference/optionalParamArgsTest.errors.txt
index 139c83f7141..5b7c500db0c 100644
--- a/tests/baselines/reference/optionalParamArgsTest.errors.txt
+++ b/tests/baselines/reference/optionalParamArgsTest.errors.txt
@@ -145,11 +145,11 @@ tests/cases/compiler/optionalParamArgsTest.ts(117,1): error TS2554: Expected 1-2
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/optionalParamArgsTest.ts:11:10: An argument for 'C1M2A1' was not provided.
     F2();
-    ~~~~
+    ~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/optionalParamArgsTest.ts:45:13: An argument for 'F2A1' was not provided.
     L2();
-    ~~~~
+    ~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/optionalParamArgsTest.ts:50:20: An argument for 'L2A1' was not provided.
     c1o1.C1M2(1,2);
@@ -185,11 +185,11 @@ tests/cases/compiler/optionalParamArgsTest.ts(117,1): error TS2554: Expected 1-2
 !!! error TS2554: Expected 1-2 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/optionalParamArgsTest.ts:13:10: An argument for 'C1M4A1' was not provided.
     F4();
-    ~~~~
+    ~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/optionalParamArgsTest.ts:47:13: An argument for 'F4A1' was not provided.
     L4();
-    ~~~~
+    ~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/optionalParamArgsTest.ts:52:20: An argument for 'L4A1' was not provided.
     
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt
index 6b64cd8a773..95e9bf27d23 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.errors.txt
@@ -17,7 +17,7 @@ tests/cases/compiler/overloadsAndTypeArgumentArityErrors.ts(9,1): error TS2554:
     
     declare function f<A, B = {}>(arg: number): void;
     f<number>(); // wrong number of arguments (#25683)
-    ~~~~~~~~~~~
+    ~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/overloadsAndTypeArgumentArityErrors.ts:8:31: An argument for 'arg' was not provided.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/requiredInitializedParameter1.errors.txt b/tests/baselines/reference/requiredInitializedParameter1.errors.txt
index f9baca7a1b5..e5963845d28 100644
--- a/tests/baselines/reference/requiredInitializedParameter1.errors.txt
+++ b/tests/baselines/reference/requiredInitializedParameter1.errors.txt
@@ -14,7 +14,7 @@ tests/cases/compiler/requiredInitializedParameter1.ts(16,1): error TS2554: Expec
     f4(0, 1, 2);
     
     f1(0, 1);
-    ~~~~~~~~
+    ~~
 !!! error TS2554: Expected 3 arguments, but got 2.
 !!! related TS6210 tests/cases/compiler/requiredInitializedParameter1.ts:1:23: An argument for 'c' was not provided.
     f2(0, 1);
@@ -22,7 +22,7 @@ tests/cases/compiler/requiredInitializedParameter1.ts(16,1): error TS2554: Expec
     f4(0, 1);
     
     f1(0);
-    ~~~~~
+    ~~
 !!! error TS2554: Expected 3 arguments, but got 1.
 !!! related TS6210 tests/cases/compiler/requiredInitializedParameter1.ts:1:16: An argument for 'b' was not provided.
     f2(0);
diff --git a/tests/baselines/reference/restParamsWithNonRestParams.errors.txt b/tests/baselines/reference/restParamsWithNonRestParams.errors.txt
index 5bbcf92f702..067cf6c8267 100644
--- a/tests/baselines/reference/restParamsWithNonRestParams.errors.txt
+++ b/tests/baselines/reference/restParamsWithNonRestParams.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/restParamsWithNonRestParams.ts(4,1): error TS2555: Expected
     foo(); // ok
     function foo2(a:string, ...b:number[]){}
     foo2(); // should be an error
-    ~~~~~~
+    ~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
 !!! related TS6210 tests/cases/compiler/restParamsWithNonRestParams.ts:3:15: An argument for 'a' was not provided.
     function foo3(a?:string, ...b:number[]){}
diff --git a/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt b/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt
index 393e21edb6c..d37b20f7403 100644
--- a/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt
+++ b/tests/baselines/reference/spreadOfParamsFromGeneratorMakesRequiredParams.errors.txt
@@ -10,6 +10,6 @@ tests/cases/compiler/spreadOfParamsFromGeneratorMakesRequiredParams.ts(6,1): err
     ): any;
     
     call(function* (a: 'a') { }); // error, 2nd argument required
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/compiler/spreadOfParamsFromGeneratorMakesRequiredParams.ts:3:5: An argument for 'args' was not provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeCallSignatures.errors.txt b/tests/baselines/reference/unionTypeCallSignatures.errors.txt
index f7a2c9d0766..3aaf2dad581 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.errors.txt
+++ b/tests/baselines/reference/unionTypeCallSignatures.errors.txt
@@ -52,7 +52,7 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
                                 ~~~~
 !!! error TS2345: Argument of type 'true' is not assignable to parameter of type 'string'.
     unionOfDifferentReturnType1(); // error missing parameter
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:12:37: An argument for 'a' was not provided.
     
@@ -66,13 +66,13 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number & string'.
 !!! error TS2345:   Type '"hello"' is not assignable to type 'number'.
     unionOfDifferentParameterTypes();// error - no call signatures
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:18:40: An argument for 'a' was not provided.
     
     var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number): Date; (a: string): boolean; };
     unionOfDifferentNumberOfSignatures(); // error - no call signatures
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:23:44: An argument for 'a' was not provided.
     unionOfDifferentNumberOfSignatures(10); // error - no call signatures
@@ -82,11 +82,11 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
     
     var unionWithDifferentParameterCount: { (a: string): string; } | { (a: string, b: number): number; } ;
     unionWithDifferentParameterCount();// needs more args
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:28:69: An argument for 'a' was not provided.
     unionWithDifferentParameterCount("hello");// needs more args
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:28:80: An argument for 'b' was not provided.
     unionWithDifferentParameterCount("hello", 10);// OK
@@ -98,13 +98,13 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
                                                     ~~~~~~~
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
     strOrNum = unionWithOptionalParameter1(); // error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:33:37: An argument for 'a' was not provided.
     
     var unionWithOptionalParameter2: { (a: string, b?: number): string; } | { (a: string, b: number): number };
     strOrNum = unionWithOptionalParameter2('hello'); // error no call signature
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:39:87: An argument for 'b' was not provided.
     strOrNum = unionWithOptionalParameter2('hello', 10); // error no call signature
@@ -112,7 +112,7 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
                                                     ~~~~~~~
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
     strOrNum = unionWithOptionalParameter2(); // error no call signature
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:39:76: An argument for 'a' was not provided.
     
@@ -123,7 +123,7 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
                                                     ~~~~~~~
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
     strOrNum = unionWithOptionalParameter3(); // needs more args
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1-2 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:45:37: An argument for 'a' was not provided.
     
@@ -135,13 +135,13 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
                                                 ~~~~~~~
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
     strOrNum = unionWithRestParameter1(); // error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:51:33: An argument for 'a' was not provided.
     
     var unionWithRestParameter2: { (a: string, ...b: number[]): string; } | { (a: string, b: number): number };
     strOrNum = unionWithRestParameter2('hello'); // error no call signature
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:58:87: An argument for 'b' was not provided.
     strOrNum = unionWithRestParameter2('hello', 10); // error no call signature
@@ -152,7 +152,7 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
                                                 ~~~~~~~
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
     strOrNum = unionWithRestParameter2(); // error no call signature
-               ~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:58:76: An argument for 'a' was not provided.
     
@@ -164,13 +164,13 @@ tests/cases/conformance/types/union/unionTypeCallSignatures.ts(73,12): error TS2
                                                 ~~~~~~~
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
     strOrNum = unionWithRestParameter3(); // error no call signature
-               ~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2555: Expected at least 1 arguments, but got 0.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:65:33: An argument for 'a' was not provided.
     
     var unionWithRestParameter4: { (...a: string[]): string; } | { (a: string, b: string): number; };
     strOrNum = unionWithRestParameter4("hello"); // error supplied parameters do not match any call signature
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures.ts:72:76: An argument for 'b' was not provided.
     strOrNum = unionWithRestParameter4("hello", "world");
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.errors.txt b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
index 37f8d7708c5..e991b211db2 100644
--- a/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
+++ b/tests/baselines/reference/unionTypeCallSignatures4.errors.txt
@@ -26,7 +26,7 @@ tests/cases/conformance/types/union/unionTypeCallSignatures4.ts(25,18): error TS
     
     var f12345: F1 | F2 | F3 | F4 | F5;
     f12345("a");  // error
-    ~~~~~~~~~~~
+    ~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/conformance/types/union/unionTypeCallSignatures4.ts:5:23: An argument for 'b' was not provided.
     f12345("a", "b");