git.iko.soy/elk
on master help sign in
Properly prettify import declarations
058b17aEvan Czaplicki
src/AST/Module.hs+10−2
compare with master
unifiedsplit
@@ -155,7 +155,7 @@ instance Binary ImportMethod where
155instance (Pretty exs, Pretty body) => Pretty (Module exs body) where
155instance (Pretty exs, Pretty body) => Pretty (Module exs body) where
156 pretty (Module names _ exs ims body) =
156 pretty (Module names _ exs ims body) =
157 P.vcat [modul, P.text "", prettyImports, P.text "", pretty body]
157 P.vcat [modul, P.text "", prettyImports, P.text "", pretty body]
158− where
158+ where
159 modul =
159 modul =
160 P.text "module" <+> name <+> pretty exs <+> P.text "where"
160 P.text "module" <+> name <+> pretty exs <+> P.text "where"
161
161
@@ -173,5 +173,13 @@ prettyMethod (name, ImportMethod maybeAlias exposedVars) =
173 Nothing -> P.empty
173 Nothing -> P.empty
174 Just alias ->
174 Just alias ->
175 P.text "as" <+> P.text alias
175 P.text "as" <+> P.text alias
176+
177+ prettyExposed =
178+ if exposedVars == Var.closedListing
179+ then P.empty
180+ else P.text "exposing" <+> pretty exposedVars
176 in
181 in
182+ P.text "import"
183+ <+> P.text (nameToString name)
177− prettyAlias <+> P.text "exposing" <+> pretty exposedVars
184+ <+> prettyAlias
185+ <+> prettyExposed