Improve error reporting for MethodApplication

src/Compiler/Checking/Expressions/CheckExpressions.fs

@@ -10182,7 +10182,7 @@ and TcMethodApplication
             CanonicalizePartialInferenceProblem cenv.css denv mItem
                  (unnamedCurriedCallerArgs |> List.collectSquared (fun callerArg -> freeInTypeLeftToRight g false callerArg.CallerArgumentType))
 
-        let result, errors = ResolveOverloadingForCall denv cenv.css mMethExpr methodName callerArgs ad postArgumentTypeCheckingCalledMethGroup true returnTy
+        let result, errors = ResolveOverloadingForCall denv cenv.css mItem methodName callerArgs ad postArgumentTypeCheckingCalledMethGroup true returnTy
 
         match afterResolution, result with
         | AfterResolution.DoNothing, _ -> ()

src/Compiler/Checking/NameResolution.fs

@@ -4075,14 +4075,15 @@ let private ResolveExprDotLongIdent (ncenv: NameResolver) m ad nenv ty (id: Iden
     | _ ->
         ForceRaise adhocDotSearchAccessible
 
-let ComputeItemRange wholem (lid: Ident list) rest =
-    match rest with
-    | [] -> wholem
-    | _ ->
-        let ids = List.truncate (max 0 (lid.Length - rest.Length)) lid
-        match ids with
-        | [] -> wholem
-        | _ -> rangeOfLid ids
+let ComputeItemRange wholem (lid: Ident list) =
+    if List.isEmpty lid then
+        wholem
+    else
+        lid
+        |> List.tryLast
+        |> Option.map (fun id -> id.idRange)
+        |> Option.defaultValue wholem
+
 
 /// Filters method groups that will be sent to Visual Studio IntelliSense
 /// to include only static/instance members
@@ -4130,7 +4131,7 @@ let ResolveLongIdentAsExprAndComputeRange (sink: TcResultsSink) (ncenv: NameReso
     match ResolveExprLongIdent sink ncenv wholem ad nenv typeNameResInfo lid maybeAppliedArgExpr with 
     | Exception e -> Exception e 
     | Result (tinstEnclosing, item1, rest) ->
-    let itemRange = ComputeItemRange wholem lid rest
+    let itemRange = ComputeItemRange wholem lid
 
     let item = FilterMethodGroups ncenv itemRange item1 true
 
@@ -4200,7 +4201,7 @@ let ResolveExprDotLongIdentAndComputeRange (sink: TcResultsSink) (ncenv: NameRes
             | id :: rest ->
                 ResolveExprDotLongIdent ncenv wholem ad nenv ty id rest typeNameResInfo findFlag maybeAppliedArgExpr
             | _ -> error(InternalError("ResolveExprDotLongIdentAndComputeRange", wholem))
-        let itemRange = ComputeItemRange wholem lid rest
+        let itemRange = ComputeItemRange wholem lid
         resInfo, item, rest, itemRange
 
     // "true" resolution

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/Basic/Basic.fs

@@ -57,9 +57,9 @@ module AccessibilityAnnotations_Basic =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 1094, Line 18, Col 17, Line 18, Col 41, "The value 'somePrivateField' is not accessible from this code location")
-            (Error 1094, Line 19, Col 17, Line 19, Col 42, "The value 'somePrivateMethod' is not accessible from this code location")
-            (Error 491, Line 23, Col 17, Line 23, Col 34, "The member or object constructor 'PrivateMethod' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
+            (Error 1094, Line 18, Col 25, Line 18, Col 41, "The value 'somePrivateField' is not accessible from this code location")
+            (Error 1094, Line 19, Col 25, Line 19, Col 42, "The value 'somePrivateMethod' is not accessible from this code location")
+            (Error 491, Line 23, Col 19, Line 23, Col 34, "The member or object constructor 'PrivateMethod' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
         ]
 
     //SOURCE=E_privateThingsInaccessible02.fs SCFLAGS="--test:ErrorRanges"            # E_privateThingsInaccessible02.fs
@@ -70,11 +70,11 @@ module AccessibilityAnnotations_Basic =
         |> shouldFail
         |> withDiagnostics [
             (Error 1092, Line 26, Col 19, Line 26, Col 32, "The type 'PrivateModule' is not accessible from this code location")
-            (Error 1094, Line 26, Col 17, Line 26, Col 34, "The value 'x' is not accessible from this code location")
+            (Error 1094, Line 26, Col 33, Line 26, Col 34, "The value 'x' is not accessible from this code location")
             (Error 1092, Line 27, Col 19, Line 27, Col 32, "The type 'PrivateModule' is not accessible from this code location")
-            (Error 1094, Line 27, Col 17, Line 27, Col 34, "The value 'f' is not accessible from this code location")
-            (Error 1094, Line 29, Col 17, Line 29, Col 20, "The value 'y' is not accessible from this code location")
-            (Error 1094, Line 30, Col 17, Line 30, Col 20, "The value 'g' is not accessible from this code location")
+            (Error 1094, Line 27, Col 33, Line 27, Col 34, "The value 'f' is not accessible from this code location")
+            (Error 1094, Line 29, Col 19, Line 29, Col 20, "The value 'y' is not accessible from this code location")
+            (Error 1094, Line 30, Col 19, Line 30, Col 20, "The value 'g' is not accessible from this code location")
         ]
 
     //SOURCE=E_privateThingsInaccessible03.fs SCFLAGS="--test:ErrorRanges"            # E_privateThingsInaccessible03.fs
@@ -85,7 +85,7 @@ module AccessibilityAnnotations_Basic =
         |> shouldFail
         |> withDiagnostics [
             (Error 1092, Line 11, Col 15, Line 11, Col 28, "The type 'PrivateModule' is not accessible from this code location")
-            (Error 1094, Line 11, Col 13, Line 11, Col 30, "The value 'x' is not accessible from this code location")
+            (Error 1094, Line 11, Col 29, Line 11, Col 30, "The value 'x' is not accessible from this code location")
             (Error 39, Line 15, Col 13, Line 15, Col 26, "The value, namespace, type or module 'PrivateModule' is not defined.")
         ]
 
@@ -109,7 +109,7 @@ module AccessibilityAnnotations_Basic =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 1096, Line 11, Col 9, Line 11, Col 24, "The record, struct or class field 'foo' is not accessible from this code location")
+            (Error 1096, Line 11, Col 21, Line 11, Col 24, "The record, struct or class field 'foo' is not accessible from this code location")
         ]
 
     //SOURCE=E_PrivateImplicitCtor01.fs SCFLAGS="--test:ErrorRanges"                  # E_PrivateImplicitCtor01.fs
@@ -129,7 +129,7 @@ module AccessibilityAnnotations_Basic =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 629, Line 11, Col 24, Line 11, Col 41, "Method 'MemberwiseClone' is not accessible from this code location")
+            (Error 629, Line 11, Col 26, Line 11, Col 41, "Method 'MemberwiseClone' is not accessible from this code location")
         ]
 
     //SOURCE=E_MoreAccessibleBaseClass01.fs                                           # E_MoreAccessibleBaseClass01.fs

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/AccessibilityAnnotations/OnTypeMembers/OnTypeMembers.fs

@@ -52,7 +52,7 @@ module AccessibilityAnnotations_OnTypeMembers =
         |> shouldFail
         |> withDiagnostics [
             (Warning 1178, Line 9, Col 10, Line 9, Col 17, "The struct, record or union type 'SpecSet' is not structurally comparable because the type 'SpecMulti' does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type 'SpecSet' to clarify that the type is not comparable")
-            (Error 491, Line 14, Col 13, Line 14, Col 28, "The member or object constructor 'Impl' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
+            (Error 491, Line 14, Col 21, Line 14, Col 28, "The member or object constructor 'Impl' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
         ]
 
     // SOURCE=E_OnProperty01.fs                                                # E_OnProperty01.fs
@@ -62,18 +62,18 @@ module AccessibilityAnnotations_OnTypeMembers =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 491, Line 42, Col 1, Line 42, Col 6, "The member or object constructor 'Foo' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
-            (Error 491, Line 42, Col 9, Line 42, Col 16, "The member or object constructor 'test1' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
-            (Error 491, Line 42, Col 19, Line 42, Col 26, "The member or object constructor 'test2' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
-            (Error 491, Line 42, Col 29, Line 42, Col 36, "The member or object constructor 'test5' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
-            (Error 491, Line 42, Col 40, Line 42, Col 47, "The member or object constructor 'test6' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
-            (Error 807, Line 42, Col 60, Line 42, Col 67, "Property 'test8' is not readable")
+            (Error 491, Line 42, Col 3, Line 42, Col 6, "The member or object constructor 'Foo' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
+            (Error 491, Line 42, Col 11, Line 42, Col 16, "The member or object constructor 'test1' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
+            (Error 491, Line 42, Col 21, Line 42, Col 26, "The member or object constructor 'test2' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
+            (Error 491, Line 42, Col 31, Line 42, Col 36, "The member or object constructor 'test5' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
+            (Error 491, Line 42, Col 42, Line 42, Col 47, "The member or object constructor 'test6' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
+            (Error 807, Line 42, Col 62, Line 42, Col 67, "Property 'test8' is not readable")
             (Error 491, Line 43, Col 1, Line 43, Col 13, "The member or object constructor 'test3' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
             (Error 491, Line 44, Col 1, Line 44, Col 13, "The member or object constructor 'test4' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
             (Error 491, Line 45, Col 1, Line 45, Col 13, "The member or object constructor 'test5' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
             (Error 491, Line 46, Col 1, Line 46, Col 13, "The member or object constructor 'test6' is not accessible. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions.")
-            (Error 810, Line 47, Col 1, Line 47, Col 8, "Property 'test7' cannot be set")
-            (Error 257, Line 47, Col 1, Line 47, Col 8, "Invalid mutation of a constant expression. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...'.")
+            (Error 810, Line 47, Col 3, Line 47, Col 8, "Property 'test7' cannot be set")
+            (Error 257, Line 47, Col 3, Line 47, Col 8, "Invalid mutation of a constant expression. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...'.")
         ]
 
     // SOURCE=E_OnProperty02.fs SCFLAGS="--test:ErrorRanges"                   # E_OnProperty02.fs

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/CustomAttributes/AttributeUsage/AttributeUsage.fs

@@ -269,9 +269,9 @@ module CustomAttributes_AttributeUsage =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 685, Line 14, Col 1, Line 14, Col 6, "The generic function 'Foo' must be given explicit type argument(s)")
-            (Error 685, Line 26, Col 1, Line 26, Col 6, "The generic function 'Foo' must be given explicit type argument(s)")
-            (Error 685, Line 28, Col 1, Line 28, Col 6, "The generic function 'Foo' must be given explicit type argument(s)")
+            (Error 685, Line 14, Col 3, Line 14, Col 6, "The generic function 'Foo' must be given explicit type argument(s)")
+            (Error 685, Line 26, Col 3, Line 26, Col 6, "The generic function 'Foo' must be given explicit type argument(s)")
+            (Error 685, Line 28, Col 3, Line 28, Col 6, "The generic function 'Foo' must be given explicit type argument(s)")
         ]
 
     // SOURCE=E_RequiresExplicitTypeArguments02.fs SCFLAGS="--test:ErrorRanges"	# E_RequiresExplicitTypeArguments02.fs
@@ -281,7 +281,7 @@ module CustomAttributes_AttributeUsage =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 685, Line 20, Col 5, Line 20, Col 10, "The generic function 'Foo' must be given explicit type argument(s)")
+            (Error 685, Line 20, Col 7, Line 20, Col 10, "The generic function 'Foo' must be given explicit type argument(s)")
         ]
 
     // SOURCE=E_WithBitwiseOr01.fsx  SCFLAGS="--test:ErrorRanges -a"	# E_WithBitwiseOr01.fsx

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/ImportDeclarations/ImportDeclarations.fs

@@ -142,7 +142,7 @@ let main _ =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 1201, Line 15, Col 59, Line 15, Col 101, "Cannot call an abstract base member: 'Write'")
+            (Error 1201, Line 15, Col 64, Line 15, Col 101, "Cannot call an abstract base member: 'Write'")
         ]
 
 
@@ -178,5 +178,5 @@ let main _ =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 1201, Line 13, Col 59, Line 13, Col 101, "Cannot call an abstract base member: 'Write'")
+            (Error 1201, Line 13, Col 64, Line 13, Col 101, "Cannot call an abstract base member: 'Write'")
         ]

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs

@@ -244,7 +244,7 @@ module MemberDefinitions_MethodsAndProperties =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 493, Line 10, Col 14, Line 10, Col 30, "StaticMethod is not an instance method")
+            (Error 493, Line 10, Col 16, Line 10, Col 30, "StaticMethod is not an instance method")
         ]
 
     // SOURCE=genericGenericClass.fs			# genericGenericClass.fs

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/NamedArguments/NamedArguments.fs

@@ -37,7 +37,7 @@ module MemberDefinitions_NamedArguments =
         |> verifyCompile
         |> shouldFail
         |> withDiagnostics [
-            (Error 35, Line 16, Col 1, Line 16, Col 35, "This construct is deprecated: The unnamed arguments do not form a prefix of the arguments of the method called")
+            (Error 35, Line 16, Col 3, Line 16, Col 35, "This construct is deprecated: The unnamed arguments do not form a prefix of the arguments of the method called")
         ]
 
     // SOURCE=E_NonNamedAfterNamed.fs		# E_NonNamedAfterNamed.fs
@@ -58,8 +58,8 @@ module MemberDefinitions_NamedArguments =
         |> shouldFail
         |> withDiagnostics [
             (Error 941, Line 13, Col 28, Line 13, Col 38, "Accessibility modifiers are not permitted on overrides or interface implementations")
-            (Error 497, Line 18, Col 1, Line 18, Col 32, "The member or object constructor 'NamedMeth1' requires 1 additional argument(s). The required signature is 'abstract IFoo.NamedMeth1: arg1: int * arg2: int * arg3: int * arg4: int -> float'.")
-            (Error 500, Line 19, Col 1, Line 19, Col 43, "The member or object constructor 'NamedMeth1' requires 4 argument(s) but is here given 2 unnamed and 3 named argument(s). The required signature is 'abstract IFoo.NamedMeth1: arg1: int * arg2: int * arg3: int * arg4: int -> float'.")
+            (Error 497, Line 18, Col 3, Line 18, Col 32, "The member or object constructor 'NamedMeth1' requires 1 additional argument(s). The required signature is 'abstract IFoo.NamedMeth1: arg1: int * arg2: int * arg3: int * arg4: int -> float'.")
+            (Error 500, Line 19, Col 3, Line 19, Col 43, "The member or object constructor 'NamedMeth1' requires 4 argument(s) but is here given 2 unnamed and 3 named argument(s). The required signature is 'abstract IFoo.NamedMeth1: arg1: int * arg2: int * arg3: int * arg4: int -> float'.")
         ]
 
     // SOURCE=E_ReusedParam.fs			# E_ReusedParam.fs
@@ -82,7 +82,7 @@ module MemberDefinitions_NamedArguments =
         |> withDiagnostics [
             (Error 39, Line 8, Col 47, Line 8, Col 51, "The value or constructor 'arg1' is not defined.")
             (Error 39, Line 8, Col 54, Line 8, Col 58, "The value or constructor 'arg2' is not defined.")
-            (Error 3, Line 12, Col 1, Line 12, Col 8, "This value is not a function and cannot be applied.")
+            (Error 3, Line 12, Col 3, Line 12, Col 8, "This value is not a function and cannot be applied.")
         ]
 
     // SOURCE=genericNamedParams.fs		# genericNamedParams.fs