on master help sign in
Merge pull request #1079 from elm-lang/dev

Bring in latest changes

commitf4ea9e31c00130cac7a39cac2ec30ce76e7584f3 authorEvan Czaplicki <info@elm-lang.org> dateFri 2 Oct 2015, 19:48 (11 years ago) parentfc2d534fa9bfb9
2 files changed+9−2
elm-compiler.cabal+1−1 src/Reporting/Warning.hs+8−1
elm-compiler.cabal+1−1
@@ -1,6 +1,6 @@
11
22Name: elm-compiler
3−Version: 0.15.1
3+Version: 0.16
44
55Synopsis:
66 Values to help with elm-package, elm-make, and elm-lang.org.
src/Reporting/Warning.hs+8−1
@@ -7,6 +7,7 @@ import qualified Data.Aeson as Json
77import qualified Text.PrettyPrint as P
88import Text.PrettyPrint ((<+>))
99
10+import qualified AST.Helpers as Help
1011import qualified AST.Module.Name as ModuleName
1112import qualified AST.Type as Type
1213import qualified Reporting.Annotation as A
@@ -50,9 +51,15 @@ toReport dealiaser warning =
5051 ++ P.render (P.nest 4 typeDoc)
5152 )
5253 where
54+ nameDoc =
55+ if Help.isOp name then
56+ P.parens (P.text name)
57+ else
58+ P.text name
59+
5360 typeDoc =
5461 P.hang
55− (P.text name <+> P.colon)
62+ (nameDoc <+> P.colon)
5663 4
5764 (P.pretty dealiaser False inferredType)
5865