f4ea9e3 · elk · git.iko.soy

on master help sign in

Merge pull request #1079 from elm-lang/dev

f4ea9e3Evan Czaplicki11 years ago

elm-compiler.cabal+1−1

@@ -1,6 +1,6 @@

2Name: elm-compiler

3−Version: 0.15.1

3+Version: 0.16

5Synopsis:

6 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

7import qualified Text.PrettyPrint as P

8import Text.PrettyPrint ((<+>))

10+import qualified AST.Helpers as Help

10import qualified AST.Module.Name as ModuleName

11import qualified AST.Module.Name as ModuleName

11import qualified AST.Type as Type

12import qualified AST.Type as Type

12import qualified Reporting.Annotation as A

13import qualified Reporting.Annotation as A

@@ -50,9 +51,15 @@ toReport dealiaser warning =

50 ++ P.render (P.nest 4 typeDoc)

51 ++ P.render (P.nest 4 typeDoc)

51 )

52 )

52 where

53 where

54+ nameDoc =

55+ if Help.isOp name then

56+ P.parens (P.text name)

57+ else

58+ P.text name

59+

53 typeDoc =

60 typeDoc =

54 P.hang

61 P.hang

55− (P.text name <+> P.colon)

62+ (nameDoc <+> P.colon)

56 4

63 4

57 (P.pretty dealiaser False inferredType)

64 (P.pretty dealiaser False inferredType)