wip

Author: DedSec256

src/Compiler/Checking/ConstraintSolver.fs

@@ -216,7 +216,7 @@ exception ConstraintSolverTupleDiffLengths of displayEnv: DisplayEnv * contextIn
 
 exception ConstraintSolverInfiniteTypes of displayEnv: DisplayEnv * contextInfo: ContextInfo * TType * TType * range * range
 
-exception ConstraintSolverTypesNotInEqualityRelation of displayEnv: DisplayEnv * TType * TType * range * range * ContextInfo
+exception ConstraintSolverTypesNotInEqualityRelation of displayEnv: DisplayEnv * expectedTy: TType * actualTy: TType * range * range * ContextInfo
 
 exception ConstraintSolverTypesNotInSubsumptionRelation of displayEnv: DisplayEnv * argTy: TType * paramTy: TType * callRange: range * parameterRange: range
 
@@ -1755,7 +1755,7 @@ and SolveMemberConstraint (csenv: ConstraintSolverEnv) ignoreUnresolvedOverload
                             (minfos |> List.forall (fun (_, minfo) -> isIntegerTy g minfo.ApparentEnclosingType ) &&
                                 (   IsAddSubModType nm g argTy1 && IsBinaryOpOtherArgType g permitWeakResolution argTy2
                                 || IsAddSubModType nm g argTy2 && IsBinaryOpOtherArgType g permitWeakResolution argTy1)) -> 
-                        do! SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace argTy2 argTy1
+                        do! SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace argTy1 argTy2
                         do! SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace retTy argTy1
                         return TTraitBuiltIn
 
@@ -3171,6 +3171,8 @@ and SolveTypeEqualsTypeWithReport (csenv: ConstraintSolverEnv) ndeep m trace cxs
         (fun () -> SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m trace cxsln expectedTy actualTy)
         (function
         | AbortForFailedMemberConstraintResolution as err -> ErrorD err
+        | ConstraintSolverTypesNotInEqualityRelation(_, expectedTy, actualTy, _, _, _) as err ->
+            ErrorD (ErrorFromAddingTypeEquation(csenv.g, csenv.DisplayEnv, expectedTy, actualTy, err, m))
         | res -> ErrorD (ErrorFromAddingTypeEquation(csenv.g, csenv.DisplayEnv, expectedTy, actualTy, res, m)))
 
 and ArgsMustSubsumeOrConvert 

src/Compiler/Checking/ConstraintSolver.fsi

@@ -104,8 +104,8 @@ exception ConstraintSolverInfiniteTypes of
 
 exception ConstraintSolverTypesNotInEqualityRelation of
     displayEnv: DisplayEnv *
-    TType *
-    TType *
+    expectedTy: TType *
+    actualTy: TType *
     range *
     range *
     ContextInfo

tests/FSharp.Compiler.ComponentTests/ErrorMessages/ExtendedDiagnosticDataTests.fs

@@ -144,6 +144,25 @@ if true then 1 else "a"
         Assert.Equal("int", typeMismatch.ExpectedType.Format(displayContext))
         Assert.Equal("string", typeMismatch.ActualType.Format(displayContext)))
 
+[<Theory>]
+[<InlineData("""
+type R = { Field1: int }
+let f (x: R) = "" + x.Field1
+""")>]
+[<InlineData("""
+let x: string = 1
+""")>]
+let ``TypeMismatchDiagnosticExtendedData 08`` code =
+    FSharp code
+    |> typecheckResults
+    |> checkDiagnostic
+       (1, "This expression was expected to have type\n    'string'    \nbut here has type\n    'int'    ")
+       (fun (typeMismatch: TypeMismatchDiagnosticExtendedData) ->
+        let displayContext = typeMismatch.DisplayContext
+        Assert.Equal(DiagnosticContextInfo.NoContext, typeMismatch.ContextInfo)
+        Assert.Equal("string", typeMismatch.ExpectedType.Format(displayContext))
+        Assert.Equal("int", typeMismatch.ActualType.Format(displayContext)))
+
 [<Theory>]
 [<InlineData true>]
 [<InlineData false>]