Add information about which argument doesn't match

Add couple of tests
Updating bunch of baselines

src/fsharp/CompileOps.fs

@@ -811,10 +811,23 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) (canSuggestNa
               | [_] -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixSingular genericParametersMessage)
               | _ -> Some (FSComp.SR.csNoOverloadsFoundTypeParametersPrefixPlural genericParametersMessage)
 
+          let overloadMethodInfo displayEnv m (x: OverloadInformation) =
+              let paramInfo =
+                  match x.error with
+                  | :? ArgDoesNotMatchError as x ->
+                      let nameOrOneBasedIndexMessage =
+                          x.calledArg.NameOpt
+                          |> Option.map (fun n -> FSComp.SR.csOverloadCandidateNamedArgumentTypeMismatch n.idText)
+                          |> Option.defaultValue (FSComp.SR.csOverloadCandidateIndexedArgumentTypeMismatch ((snd x.calledArg.Position) + 1))
+                      sprintf " // %s" nameOrOneBasedIndexMessage
+                  | _ -> ""
+
+              (NicePrint.stringOfMethInfo x.amap m displayEnv x.methodSlot.Method) + paramInfo
+
           let nl = System.Environment.NewLine
           let formatOverloads (overloads: OverloadInformation list) =
               overloads
-              |> List.map (fun overload -> overload.OverloadMethodInfo denv m)
+              |> List.map (overloadMethodInfo denv m)
               |> List.sort
               |> List.map FSComp.SR.formatDashItem
               |> String.concat nl

src/fsharp/ConstraintSolver.fs

@@ -190,7 +190,6 @@ type OverloadInformation =
         amap : ImportMap
         error: exn
     }
-    member x.OverloadMethodInfo displayEnv m = NicePrint.stringOfMethInfo x.amap m displayEnv x.methodSlot.Method
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
@@ -523,6 +522,11 @@ exception AbortForFailedOverloadResolution
 let inline TryD_IgnoreAbortForFailedOverloadResolution f1 f2 =
     TryD f1 (function AbortForFailedOverloadResolution -> CompleteD | exn -> f2 exn)
 
+exception LocallyAbortOperationThatFailsToResolveOverload
+
+/// used to provide detail about non matched argument in overload resolution error message
+exception ArgDoesNotMatchError of error: ErrorsFromAddingSubsumptionConstraint * calledMeth: CalledMeth<Expr> * calledArg: CalledArg * callerArg: CallerArg<Expr>
+
 /// Represents a very local condition where we prefer to report errors before stripping type abbreviations.
 exception LocallyAbortOperationThatLosesAbbrevs 
 
@@ -2180,7 +2184,6 @@ and SolveTypeRequiresDefaultConstructor (csenv: ConstraintSolverEnv) ndeep m2 tr
                     CompleteD
                 | _ -> 
                     ErrorD (ConstraintSolverError(FSComp.SR.csGenericConstructRequiresPublicDefaultConstructor(NicePrint.minimalStringOfType denv origTy), m, m2))
-
 // Parameterized compatibility relation between member signatures.  The real work
 // is done by "equateTypes" and "subsumeTypes" and "subsumeArg"
 and CanMemberSigsMatchUpToCheck 
@@ -2280,18 +2283,21 @@ and CanMemberSigsMatchUpToCheck
 //
 // "ty2 casts to ty1"
 // "a value of type ty2 can be used where a value of type ty1 is expected"
-and private SolveTypeSubsumesTypeWithReport (csenv: ConstraintSolverEnv) ndeep m trace cxsln ty1 ty2 =
+and private SolveTypeSubsumesTypeWithWrappedContextualReport (csenv: ConstraintSolverEnv) ndeep m trace cxsln ty1 ty2 wrapper =
     TryD_IgnoreAbortForFailedOverloadResolution
         (fun () -> SolveTypeSubsumesTypeKeepAbbrevs csenv ndeep m trace cxsln ty1 ty2)
         (fun res ->
             match csenv.eContextInfo with
             | ContextInfo.RuntimeTypeTest isOperator ->
                 // test if we can cast other way around
                 match CollectThenUndo (fun newTrace -> SolveTypeSubsumesTypeKeepAbbrevs csenv ndeep m (OptionalTrace.WithTrace newTrace) cxsln ty2 ty1) with 
-                | OkResult _ -> ErrorD (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.DowncastUsedInsteadOfUpcast isOperator, m))
-                | _ -> ErrorD (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.NoContext, m))
-            | _ -> ErrorD (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, csenv.eContextInfo, m)))
+                | OkResult _ -> ErrorD (wrapper (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.DowncastUsedInsteadOfUpcast isOperator, m)))
+                | _ -> ErrorD (wrapper (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, ContextInfo.NoContext, m)))
+            | _ -> ErrorD (wrapper (ErrorsFromAddingSubsumptionConstraint(csenv.g, csenv.DisplayEnv, ty1, ty2, res, csenv.eContextInfo, m))))
 
+and private SolveTypeSubsumesTypeWithReport (csenv: ConstraintSolverEnv) ndeep m trace cxsln ty1 ty2 =
+        SolveTypeSubsumesTypeWithWrappedContextualReport (csenv) ndeep m trace cxsln ty1 ty2 id
+
 // ty1: actual
 // ty2: expected
 and private SolveTypeEqualsTypeWithReport (csenv: ConstraintSolverEnv) ndeep  m trace cxsln actual expected = 
@@ -2324,9 +2330,9 @@ and MustUnify csenv ndeep trace cxsln ty1 ty2 =
 and MustUnifyInsideUndo csenv ndeep trace cxsln ty1 ty2 = 
     SolveTypeEqualsTypeWithReport csenv ndeep csenv.m (WithTrace trace) cxsln ty1 ty2
 
-and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledArg callerArg = 
+and ArgsMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln isConstraint calledMeth calledArg callerArg = 
     let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
-    SolveTypeSubsumesTypeWithReport csenv ndeep callerArg.Range (WithTrace trace) cxsln calledArgTy callerArg.ArgumentType 
+    SolveTypeSubsumesTypeWithWrappedContextualReport csenv ndeep callerArg.Range (WithTrace trace) cxsln calledArgTy callerArg.ArgumentType (fun e -> ArgDoesNotMatchError(e :?> _, calledMeth, calledArg, callerArg)) 
 
 and TypesMustSubsumeOrConvertInsideUndo (csenv: ConstraintSolverEnv) ndeep trace cxsln m calledArgTy callerArgTy = 
     SolveTypeSubsumesTypeWithReport csenv ndeep m trace cxsln calledArgTy callerArgTy 
@@ -2499,7 +2505,7 @@ and ResolveOverloading
           // Exact match rule.
           //
           // See what candidates we have based on current inferred type information 
-          // and _exact_ matches of argument types. 
+          // and _exact_ matches of argument types.
           match candidates |> FilterEachThenUndo (fun newTrace calledMeth -> 
                      let cxsln = Option.map (fun traitInfo -> (traitInfo, MemberConstraintSolutionOfMethInfo csenv.SolverState m calledMeth.Method calledMeth.CalledTyArgs)) cx
                      CanMemberSigsMatchUpToCheck 
@@ -2525,7 +2531,7 @@ and ResolveOverloading
                                    alwaysCheckReturn
                                    (MustUnifyInsideUndo csenv ndeep newTrace cxsln) 
                                    (TypesMustSubsumeOrConvertInsideUndo csenv ndeep (WithTrace newTrace) cxsln m)
-                                   (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome) 
+                                   (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome candidate) 
                                    reqdRetTyOpt 
                                    candidate)
 
@@ -2561,11 +2567,12 @@ and ResolveOverloading
                                              alwaysCheckReturn
                                              (MustUnifyInsideUndo csenv ndeep newTrace cxsln) 
                                              (TypesMustSubsumeOrConvertInsideUndo csenv ndeep (WithTrace newTrace) cxsln m)
-                                             (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome) 
+                                             (ArgsMustSubsumeOrConvertInsideUndo csenv ndeep newTrace cxsln cx.IsSome calledMeth) 
                                              reqdRetTyOpt 
                                              calledMeth) with 
                             | OkResult _ -> None
-                            | ErrorResult(_, exn) -> Some {methodSlot = calledMeth; amap = amap; error = exn })
+                            | ErrorResult(_warnings, exn) ->
+                                Some {methodSlot = calledMeth; amap = amap; error = exn })
 
                 None, ErrorD (failOverloading (NoOverloadsFound (methodName, errors, cx))), NoTrace
 
@@ -2635,7 +2642,7 @@ and ResolveOverloading
                     // Prefer methods with more precise param array arg type
                     let c = 
                         if candidate.UsesParamArrayConversion && other.UsesParamArrayConversion then
-                            compareTypes (candidate.GetParamArrayElementType()) (other.GetParamArrayElementType())
+                            compareTypes candidate.ParamArrayElementType other.ParamArrayElementType
                         else
                             0
                     if c <> 0 then c else

src/fsharp/ConstraintSolver.fsi

@@ -98,7 +98,6 @@ type OverloadInformation =
         amap : ImportMap
         error: exn
     }
-    member OverloadMethodInfo : displayEnv: DisplayEnv -> m: range -> string
 
 /// Cases for overload resolution failure that exists in the implementation of the compiler.
 type OverloadResolutionFailure =
@@ -124,7 +123,7 @@ exception ErrorFromAddingConstraint             of displayEnv: DisplayEnv * exn
 exception UnresolvedConversionOperator          of displayEnv: DisplayEnv * TType * TType * range
 exception UnresolvedOverloading                 of displayEnv: DisplayEnv * callerArgs: CallerArgs<Expr> * failure: OverloadResolutionFailure * range
 exception NonRigidTypar                         of displayEnv: DisplayEnv * string option * range * TType * TType * range
-
+exception ArgDoesNotMatchError                  of error: ErrorsFromAddingSubsumptionConstraint * calledMeth: CalledMeth<Expr> * calledArg: CalledArg * callerArg: CallerArg<Expr>
 /// A function that denotes captured tcVal, Used in constraint solver and elsewhere to get appropriate expressions for a ValRef.
 type TcValF = (ValRef -> ValUseFlag -> TType list -> range -> Expr * TType)
 

src/fsharp/FSComp.txt

@@ -370,6 +370,8 @@ csNoOverloadsFoundReturnType,"Known return type: %s"
 csMethodIsOverloaded,"A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed."
 csCandidates,"Candidates:\n%s"
 csAvailableOverloads,"Available overloads:\n%s"
+csOverloadCandidateNamedArgumentTypeMismatch,"Argument '%s' doesn't match"
+csOverloadCandidateIndexedArgumentTypeMismatch,"Argument at index %d doesn't match"
 512,parsDoCannotHaveVisibilityDeclarations,"Accessibility modifiers are not permitted on 'do' bindings, but '%s' was given."
 513,parsEofInHashIf,"End of file in #if section begun at or after here"
 514,parsEofInString,"End of file in string begun at or before here"

src/fsharp/MethodCalls.fs

@@ -350,7 +350,7 @@ type CalledMeth<'T>
 
     let fullCurriedCalledArgs = MakeCalledArgs infoReader.amap m minfo calledTyArgs
     do assert (fullCurriedCalledArgs.Length = fullCurriedCalledArgs.Length)
-
+ 
     let argSetInfos = 
         (callerArgs.CurriedCallerArgs, fullCurriedCalledArgs) 
         ||> List.map2 (fun (unnamedCallerArgs, namedCallerArgs) fullCalledArgs -> 
@@ -544,8 +544,7 @@ type CalledMeth<'T>
 
     member x.ParamArrayCallerArgs = x.ArgSets |> List.tryPick (fun argSet -> if Option.isSome argSet.ParamArrayCalledArgOpt then Some argSet.ParamArrayCallerArgs else None )
 
-    member x.GetParamArrayElementType () =
-        // turned into a method to avoid assert to run while inspecting CalledMeth in debugger
+    member x.ParamArrayElementType = 
         assert (x.UsesParamArrayConversion)
         x.ParamArrayCalledArgOpt.Value.CalledArgumentType |> destArrayTy x.amap.g 
 

tests/fsharp/conformance/expressions/type-relatedexpressions/E_RigidTypeAnnotation03.bsl

@@ -9,11 +9,11 @@ E_RigidTypeAnnotation03.fsx(17,9,17,25): typecheck error FS0041: No overloads ma
 Known type of argument: sbyte
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match
 
 E_RigidTypeAnnotation03.fsx(18,13,18,19): typecheck error FS0001: This expression was expected to have type
     'float32'    
@@ -25,11 +25,11 @@ E_RigidTypeAnnotation03.fsx(18,9,18,30): typecheck error FS0041: No overloads ma
 Known type of argument: float32
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match
 
 E_RigidTypeAnnotation03.fsx(19,13,19,20): typecheck error FS0001: This expression was expected to have type
     'float32<'u>'    
@@ -47,11 +47,11 @@ E_RigidTypeAnnotation03.fsx(20,9,20,39): typecheck error FS0041: No overloads ma
 Known type of argument: decimal<N s ^ 2>
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match
 
 E_RigidTypeAnnotation03.fsx(21,14,21,18): typecheck error FS0001: This expression was expected to have type
     'char'    
@@ -63,8 +63,8 @@ E_RigidTypeAnnotation03.fsx(21,9,21,27): typecheck error FS0041: No overloads ma
 Known type of argument: char
 
 Available overloads:
- - static member T.M : a:byte -> int
- - static member T.M : a:decimal<Kg> -> int
- - static member T.M : a:float -> int
- - static member T.M : a:float32<Kg> -> int
- - static member T.M : a:string -> int
+ - static member T.M : a:byte -> int // Argument 'a' doesn't match
+ - static member T.M : a:decimal<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:float -> int // Argument 'a' doesn't match
+ - static member T.M : a:float32<Kg> -> int // Argument 'a' doesn't match
+ - static member T.M : a:string -> int // Argument 'a' doesn't match

tests/fsharp/conformance/inference/E_TwoDifferentTypeVariablesGen00rec.bsl

@@ -11,15 +11,10 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(62,18,62,42): typecheck error FS0043: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(63,45,63,55): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(64,56,64,57): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
@@ -36,15 +31,10 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(65,18,65,42): typecheck error FS0043: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(66,45,66,59): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(67,55,67,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'a has been constrained to be type ''b'.
@@ -55,15 +45,10 @@ E_TwoDifferentTypeVariablesGen00rec.fsx(67,18,67,42): typecheck error FS0043: Th
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(68,45,68,58): typecheck error FS0041: A unique overload for method 'M' could not be determined based on type information prior to this program point. A type annotation may be needed.
 
-
-
 Known types of arguments: 'a * 'b
 
-
-
 Candidates:
  - static member C13.M : x:'a * y:'a -> One
-
  - static member C13.M : x:'a * y:int -> Three
 
 E_TwoDifferentTypeVariablesGen00rec.fsx(69,55,69,56): typecheck error FS0064: This construct causes code to be less generic than indicated by the type annotations. The type variable 'b has been constrained to be type 'int'.