Revert "Display a merged error message"

This reverts commit 7b4c4d6.
purescript · FredTheDino · Nov 29, 2022 · Dec 4, 2022 · Dec 4, 2022 · Dec 16, 2022
commit c0cd73dfe973e411b04123cd7a3009b526f8f8ba
diff --git a/src/Language/PureScript/Errors.hs b/src/Language/PureScript/Errors.hs
@@ -846,12 +846,6 @@ prettyPrintSingleError (PPEOptions codeColor full level showDocs relPath fileCon
             , line "has escaped its scope, appearing in the type"
             , markCodeBox $ indent $ prettyType ty
             ]
-
-    renderSimpleErrorMessage (TypesDoNotUnify (r1@RCons{}) (r2@RCons{}))
-      = paras [ line "Failed to match row type"
-              , printRowsAsDiff (rowToList r1) (rowToList r2)
-              ]
-
     renderSimpleErrorMessage (TypesDoNotUnify u1 u2)
       = let (row1Box, row2Box) = printRows u1 u2
 
@@ -1565,26 +1559,6 @@ prettyPrintSingleError (PPEOptions codeColor full level showDocs relPath fileCon
     printRow f = markCodeBox . indent . f prettyDepth .
       if full then id else eraseForAllKindAnnotations . eraseKindApps
 
-    -- NOTE: It might be hard to write anywhere that isn't top level, so keeping this a separate path for now.
-    printRowsAsDiff :: ([RowListItem a], Type a) -> ([RowListItem a], Type a) -> Box.Box
-    printRowsAsDiff (r1, ty1) (r2, _) = 
-        printRow (rowsDiffAsInterlacedBox (mergeRows r1 r2)) ty1
-
-    mergeRows :: [RowListItem a] -> [RowListItem a] -> [(Label, Maybe (Type a), Maybe (Type a))]
-    mergeRows a b = merge (sort' a) (sort' b)
-      where
-      sort' = sortOn $ \(RowListItem _ name ty) -> (name, ty)
-
-      merge :: [RowListItem a] -> [RowListItem a] -> [(Label, Maybe (Type a), Maybe (Type a))]
-      merge s1@((RowListItem _ name1 ty1) : t1) s2@((RowListItem _ name2 ty2) : t2) = 
-          case name1 `compare` name2 of
-            EQ | ty1 == ty2 ->                  merge t1 t2
-            EQ -> (name1, Just ty1, Just ty2) : merge t1 t2
-            LT -> (name1, Just ty1, Nothing ) : merge t1 s2
-            GT -> (name2, Nothing , Just ty2) : merge s1 t2
-      merge _ _ = []
-
-
     -- If both rows are not empty, print them as diffs
     -- If verbose print all rows else only print unique rows
     printRows :: Type a -> Type a -> (Box.Box, Box.Box)
@@ -1597,6 +1571,7 @@ prettyPrintSingleError (PPEOptions codeColor full level showDocs relPath fileCon
 
       (_, _, _) -> (printRow typeAsBox r1, printRow typeAsBox r2)
 
+
     -- Keep the unique labels only
     filterRows :: ([RowListItem a], Type a) -> ([RowListItem a], Type a) -> (Type a, Type a)
     filterRows (s1, r1) (s2, r2) =

diff --git a/src/Language/PureScript/Pretty/Types.hs b/src/Language/PureScript/Pretty/Types.hs
@@ -17,7 +17,6 @@ module Language.PureScript.Pretty.Types
   , prettyPrintTypeAtom
   , prettyPrintLabel
   , prettyPrintObjectKey
-  , rowsDiffAsInterlacedBox 
   ) where
 
 import Prelude hiding ((<>))
@@ -145,34 +144,6 @@ prettyPrintRowWith tro open close labels rest =
   tailToPs Nothing = nullBox
   tailToPs (Just other) = text "| " <> typeAsBox' other
 
-prettyPrintRowDiffWith :: TypeRenderOptions -> Char -> Char -> [(Label, Maybe PrettyPrintType, Maybe PrettyPrintType)] -> Box
-prettyPrintRowDiffWith tro open close labels =
-  case labels of
-    [] | troRowAsDiff tro -> text [ open, ' ' ] <> text "..." <> text [ ' ', close ]
-    [] -> text [ open, close ]
-    _ ->
-      vcat left $
-        [ text [ open ] ]
-        ++ fmap (\(name, ty1, ty2) -> nameAndTypeToPs name ty1 ty2) labels
-        ++ catMaybes [ rowDiff, pure $ text [close] ]
-
-  where
-  nameAndTypeToPs :: Label -> Maybe PrettyPrintType -> Maybe PrettyPrintType -> Box
-  nameAndTypeToPs name maybeTy1 maybeTy2 =
-    let
-      format prefix ty = text ("," ++ prefix ++ T.unpack (prettyPrintLabel name) ++ " " ++ doubleColon ++ " ") <> typeAsBox' ty
-    in
-      vcat left $
-        [ fromMaybe (text "<no row>") $ fmap (format " ") maybeTy1
-        , fromMaybe (text "<no row>") $ fmap (format " ") maybeTy2
-        , text ""
-        ]
-
-
-  doubleColon = if troUnicode tro then "∷" else "::"
-
-  rowDiff = if troRowAsDiff tro then Just (text "...") else Nothing
-
 typeApp :: Pattern () PrettyPrintType (PrettyPrintType, PrettyPrintType)
 typeApp = mkPattern match
   where
@@ -291,12 +262,6 @@ typeDiffAsBox' = typeAsBoxImpl diffOptions
 typeDiffAsBox :: Int -> Type a -> Box
 typeDiffAsBox maxDepth = typeDiffAsBox' . convertPrettyPrintType maxDepth
 
-rowsDiffAsInterlacedBox :: [(Label, Maybe (Type a), Maybe (Type a))] -> Int -> Type a -> Box
-rowsDiffAsInterlacedBox merged maxDepth _ = prettyPrintRowDiffWith diffOptions '(' ')' mergedPretty
-  where
-  mergedPretty = fmap (\(name, ty1, ty2) -> (name, fmap prettyType ty1, fmap prettyType ty2)) merged
-  prettyType = convertPrettyPrintType maxDepth 
-
 data TypeRenderOptions = TypeRenderOptions
   { troSuggesting :: Bool
   , troUnicode :: Bool