@@ -33,9 +33,9 @@ toDoc localizer tipe =
3333 docType localizer tipe
3434
3535
36−diffToDocs :: Localizer -> Style -> Type.Canonical -> Type.Canonical -> (Doc,Doc)
37−diffToDocs localizer style leftType rightType =
38− case diff localizer style leftType rightType of
36+diffToDocs :: Localizer -> Type.Canonical -> Type.Canonical -> (Doc,Doc)
37+diffToDocs localizer leftType rightType =
38+ case diff localizer leftType rightType of
3939 Same doc ->
4040 (doc, doc)
4141
@@ -158,15 +158,10 @@ partitionDiffs dict =
158158-- DOC DIFF
159159
160160
161−data Style
162− = Elide
163− | Full
164−
165−
166−diff :: Localizer -> Style -> Type.Canonical -> Type.Canonical -> Diff Doc
167−diff localizer style leftType rightType =
161+diff :: Localizer -> Type.Canonical -> Type.Canonical -> Diff Doc
162+diff localizer leftType rightType =
168163 let
169− go = diff localizer style
164+ go = diff localizer
170165 in
171166 case (leftType, rightType) of
172167 (Type.Lambda _ _, Type.Lambda _ _) ->
@@ -209,12 +204,7 @@ diff localizer style leftType rightType =
209204 (rightFields, rightExt) =
210205 flattenRecord outerRightFields outerRightExt
211206 in
212− case style of
213− Elide ->
214− diffRecordElide localizer leftFields leftExt rightFields rightExt
215−
216− Full ->
217− error "TODO"
207+ diffRecord localizer leftFields leftExt rightFields rightExt
218208
219209 (Type.Aliased leftName leftArgs _, Type.Aliased rightName rightArgs _) | leftName == rightName ->
220210 docApp localizer leftName
@@ -241,8 +231,8 @@ difference leftDoc rightDoc =
241231-- RECORD DIFFS
242232
243233
244−diffRecordElide :: Localizer -> Fields -> Maybe String -> Fields -> Maybe String -> Diff Doc
245−diffRecordElide localizer leftFields leftExt rightFields rightExt =
234+diffRecord :: Localizer -> Fields -> Maybe String -> Fields -> Maybe String -> Diff Doc
235+diffRecord localizer leftFields leftExt rightFields rightExt =
246236 let
247237 (leftOnly, both, rightOnly) =
248238 vennDiagram leftFields rightFields
@@ -250,7 +240,7 @@ diffRecordElide localizer leftFields leftExt rightFields rightExt =
250240 if Map.null leftOnly && Map.null rightOnly then
251241 let
252242 fieldDiffs =
253− Map.map (uncurry (diff localizer Elide)) both
243+ Map.map (uncurry (diff localizer)) both
254244 in
255245 case partitionDiffs fieldDiffs of
256246 ([], sames) ->
@@ -467,6 +457,11 @@ docApp localizer name args =
467457
468458
469459
460+data Style
461+ = Elide
462+ | Full
463+
464+
470465docRecord :: Style -> [(Doc,Doc)] -> Maybe Doc -> Doc
471466docRecord style fields maybeExt =
472467 let