sd

Author: DedSec256

src/Compiler/Symbols/FSharpDiagnostic.fs

@@ -199,7 +199,7 @@ type FSharpDiagnostic(m: range, severity: FSharpDiagnosticSeverity, message: str
 
             match diagnostic.Exception with
             | ErrorFromAddingTypeEquation(_, displayEnv, expectedType, actualType, ConstraintSolverTupleDiffLengths(contextInfo = contextInfo), _)
-            | ErrorFromAddingTypeEquation(_, displayEnv, expectedType, actualType, ConstraintSolverTypesNotInEqualityRelation(_, _, _, _, _, contextInfo), _)
+            | ErrorFromAddingTypeEquation(_, displayEnv, _, _, ConstraintSolverTypesNotInEqualityRelation(_, expectedType, actualType, _, _, contextInfo), _)
             | ErrorsFromAddingSubsumptionConstraint(_, displayEnv, expectedType, actualType, _, contextInfo, _) ->
                let context = DiagnosticContextInfo.From(contextInfo)
                Some(TypeMismatchDiagnosticExtendedData(symbolEnv, displayEnv, expectedType, actualType, context))

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

@@ -156,7 +156,7 @@ let ``TypeMismatchDiagnosticExtendedData 08`` code =
     FSharp code
     |> typecheckResults
     |> checkDiagnostic
-       (1, "This expression was expected to have type\n    'string'    \nbut here has type\n    'int'    ")
+       (1, "The type 'int' does not match the type 'string'")
        (fun (typeMismatch: TypeMismatchDiagnosticExtendedData) ->
         let displayContext = typeMismatch.DisplayContext
         Assert.Equal(DiagnosticContextInfo.NoContext, typeMismatch.ContextInfo)