git.iko.soy/elk
on master help sign in
Don't provide an "elide" option
407cbc8Evan Czaplicki
src/Reporting/Error/Type.hs+1−1
compare with master
unifiedsplit
@@ -395,7 +395,7 @@ comparisonHint
395comparisonHint localizer leftType rightType leftWords rightWords finalHints =
395comparisonHint localizer leftType rightType leftWords rightWords finalHints =
396 let
396 let
397 (leftDoc, rightDoc) =
397 (leftDoc, rightDoc) =
398− RenderType.diffToDocs localizer RenderType.Elide leftType rightType
398+ RenderType.diffToDocs localizer leftType rightType
399 in
399 in
400 Help.stack $
400 Help.stack $
401 [ Help.reflowParagraph leftWords
401 [ Help.reflowParagraph leftWords
src/Reporting/Render/Type.hs+15−20
@@ -33,9 +33,9 @@ toDoc localizer tipe =
33 docType localizer tipe
33 docType localizer tipe
34
34
35
35
36−diffToDocs :: Localizer -> Style -> Type.Canonical -> Type.Canonical -> (Doc,Doc)
36+diffToDocs :: Localizer -> Type.Canonical -> Type.Canonical -> (Doc,Doc)
37−diffToDocs localizer style leftType rightType =
37+diffToDocs localizer leftType rightType =
38− case diff localizer style leftType rightType of
38+ case diff localizer leftType rightType of
39 Same doc ->
39 Same doc ->
40 (doc, doc)
40 (doc, doc)
41
41
@@ -158,15 +158,10 @@ partitionDiffs dict =
158-- DOC DIFF
158-- DOC DIFF
159
159
160
160
161−data Style
162− = Elide
163− | Full
164−
165−
166−diff :: Localizer -> Style -> Type.Canonical -> Type.Canonical -> Diff Doc
161+diff :: Localizer -> Type.Canonical -> Type.Canonical -> Diff Doc
167−diff localizer style leftType rightType =
162+diff localizer leftType rightType =
168 let
163 let
169− go = diff localizer style
164+ go = diff localizer
170 in
165 in
171 case (leftType, rightType) of
166 case (leftType, rightType) of
172 (Type.Lambda _ _, Type.Lambda _ _) ->
167 (Type.Lambda _ _, Type.Lambda _ _) ->
@@ -209,12 +204,7 @@ diff localizer style leftType rightType =
209 (rightFields, rightExt) =
204 (rightFields, rightExt) =
210 flattenRecord outerRightFields outerRightExt
205 flattenRecord outerRightFields outerRightExt
211 in
206 in
212− case style of
213− Elide ->
214− diffRecordElide localizer leftFields leftExt rightFields rightExt
207+ diffRecord localizer leftFields leftExt rightFields rightExt
215−
216− Full ->
217− error "TODO"
218
208
219 (Type.Aliased leftName leftArgs _, Type.Aliased rightName rightArgs _) | leftName == rightName ->
209 (Type.Aliased leftName leftArgs _, Type.Aliased rightName rightArgs _) | leftName == rightName ->
220 docApp localizer leftName
210 docApp localizer leftName
@@ -241,8 +231,8 @@ difference leftDoc rightDoc =
241-- RECORD DIFFS
231-- RECORD DIFFS
242
232
243
233
244−diffRecordElide :: Localizer -> Fields -> Maybe String -> Fields -> Maybe String -> Diff Doc
234+diffRecord :: Localizer -> Fields -> Maybe String -> Fields -> Maybe String -> Diff Doc
245−diffRecordElide localizer leftFields leftExt rightFields rightExt =
235+diffRecord localizer leftFields leftExt rightFields rightExt =
246 let
236 let
247 (leftOnly, both, rightOnly) =
237 (leftOnly, both, rightOnly) =
248 vennDiagram leftFields rightFields
238 vennDiagram leftFields rightFields
@@ -250,7 +240,7 @@ diffRecordElide localizer leftFields leftExt rightFields rightExt =
250 if Map.null leftOnly && Map.null rightOnly then
240 if Map.null leftOnly && Map.null rightOnly then
251 let
241 let
252 fieldDiffs =
242 fieldDiffs =
253− Map.map (uncurry (diff localizer Elide)) both
243+ Map.map (uncurry (diff localizer)) both
254 in
244 in
255 case partitionDiffs fieldDiffs of
245 case partitionDiffs fieldDiffs of
256 ([], sames) ->
246 ([], sames) ->
@@ -467,6 +457,11 @@ docApp localizer name args =
467
457
468
458
469
459
460+data Style
461+ = Elide
462+ | Full
463+
464+
470docRecord :: Style -> [(Doc,Doc)] -> Maybe Doc -> Doc
465docRecord :: Style -> [(Doc,Doc)] -> Maybe Doc -> Doc
471docRecord style fields maybeExt =
466docRecord style fields maybeExt =
472 let
467 let