7feccac · elk · git.iko.soy

builder/src/Reporting/Exit/Compile.hs+5−6

compare with master

unifiedsplit

@@ -9,7 +9,6 @@ module Reporting.Exit.Compile

9

10

11import qualified Data.List as List

12−import qualified Data.Text as Text

13import qualified Data.Time.Clock as Time

12import qualified Data.Time.Clock as Time

14

13

15import qualified Elm.Compiler as Compiler

14import qualified Elm.Compiler as Compiler

@@ -27,7 +26,7 @@ data Exit =

27 { _name :: ModuleName.Raw

26 { _name :: ModuleName.Raw

28 , _path :: FilePath

27 , _path :: FilePath

29 , _time :: Time.UTCTime

28 , _time :: Time.UTCTime

30− , _source :: Text.Text

29+ , _source :: String

31 , _errors :: [Compiler.Error]

30 , _errors :: [Compiler.Error]

32 }

31 }

33

32

@@ -71,13 +70,13 @@ exitToDoc (Exit _name path _time source errors) =

71separator :: ModuleName.Raw -> ModuleName.Raw -> D.Doc

70separator :: ModuleName.Raw -> ModuleName.Raw -> D.Doc

72separator beforeName afterName =

71separator beforeName afterName =

73 let

72 let

74− before = ModuleName.nameToString beforeName ++ " ↑ "

73+ before = ModuleName.nameToChars beforeName ++ " ↑ "

75− after = " ↓ " ++ ModuleName.nameToString afterName

74+ after = " ↓ " ++ ModuleName.nameToChars afterName

76 in

75 in

77 D.dullred $ D.vcat $

76 D.dullred $ D.vcat $

78− [ D.indent (80 - length before) (D.fromString before)

77+ [ D.indent (80 - length before) (D.fromChars before)

79 , "====o======================================================================o===="

78 , "====o======================================================================o===="

80− , D.fromString after

79+ , D.fromChars after

81 , D.empty

80 , D.empty

82 , D.empty

81 , D.empty

83 ]

82 ]

terminal/src/Init.hs+4−4

@@ -13,10 +13,10 @@ import qualified System.Directory as Dir

13import qualified Deps.Cache as Cache

14import qualified Deps.Explorer as Explorer

15import qualified Deps.Solver as Solver

16−import qualified Elm.Compiler.Version as Compiler

16+import qualified Elm.Constraint as Con

17import qualified Elm.Package as Pkg

18−import qualified Elm.Project.Constraint as Con

19import qualified Elm.Project.Json as Project

18import qualified Elm.Project.Json as Project

19+import qualified Elm.Version as V

20import qualified Reporting.Doc as D

21import qualified Reporting.Exit as Exit

22import qualified Reporting.Exit.Init as E

@@ -58,7 +58,7 @@ question =

58 \ my project? How do I see it in the browser? How will my code grow? Do I need\

59 \ more directories? What about tests? Etc."

60 , D.fillSep

61− ["Check","out",D.cyan (D.fromString (D.makeLink "init"))

61+ ["Check","out",D.cyan (D.fromChars (D.makeLink "init"))

62 ,"for","all","the","answers!"

63 ]

64 , "Knowing all that, would you like me to create an elm.json file now? [Y/n]: "

@@ -85,7 +85,7 @@ init =

85 liftIO $

86 do Dir.createDirectoryIfMissing True "src"

87 Project.write "." $ Project.App $

88− Project.AppInfo Compiler.version ["src"] directs indirects Map.empty Map.empty

88+ Project.AppInfo V.compiler ["src"] directs indirects Map.empty Map.empty

89

90 Nothing ->

91 Task.throw (Exit.Init (E.NoSolution (Map.keys defaults)))

terminal/src/Main.hs+2−3

@@ -12,9 +12,8 @@ import qualified Text.PrettyPrint.ANSI.Leijen as P

12import Text.PrettyPrint.ANSI.Leijen ((<>))

13import Text.Read (readMaybe)

14

15−import qualified Elm.Compiler as Compiler

16import qualified Elm.Diff as Diff

15import qualified Elm.Diff as Diff

17−import qualified Elm.Package as Pkg

16+import qualified Elm.Version as V

18import qualified Generate.Output as Output

17import qualified Generate.Output as Output

19import Terminal.Args

18import Terminal.Args

20import Terminal.Args.Helpers

19import Terminal.Args.Helpers

@@ -54,7 +53,7 @@ intro =

54 [ P.fillSep

53 [ P.fillSep

55 ["Hi,","thank","you","for","trying","out"

54 ["Hi,","thank","you","for","trying","out"

56 ,P.green "Elm"

55 ,P.green "Elm"

57− ,P.green (P.text (Pkg.versionToString Compiler.version)) <> "."

56+ ,P.green (P.text (V.toChars V.compiler)) <> "."

58 ,"I hope you like it!"

57 ,"I hope you like it!"

59 ]

58 ]

60 , ""

59 , ""

terminal/src/Terminal/Args.hs+3−4

@@ -24,8 +24,7 @@ import System.IO (hPutStr, hPutStrLn, stdout)

24import qualified Text.PrettyPrint.ANSI.Leijen as P

25import qualified Text.Read as Read

26

27−import qualified Elm.Compiler as Compiler

27+import qualified Elm.Version as V

28−import qualified Elm.Package as Pkg

29import Terminal.Args.Internal

28import Terminal.Args.Internal

30import qualified Terminal.Args.Chomp as Chomp

29import qualified Terminal.Args.Chomp as Chomp

31import qualified Terminal.Args.Error as Error

30import qualified Terminal.Args.Error as Error

@@ -40,7 +39,7 @@ simple details example args_ flags_ callback =

40 do argStrings <- Env.getArgs

39 do argStrings <- Env.getArgs

41 case argStrings of

40 case argStrings of

42 ["--version"] ->

41 ["--version"] ->

43− do hPutStrLn stdout (Pkg.versionToString Compiler.version)

42+ do hPutStrLn stdout (V.toChars V.compiler)

44 Exit.exitSuccess

43 Exit.exitSuccess

45

44

46 chunks ->

45 chunks ->

@@ -67,7 +66,7 @@ complex intro outro interfaces =

67 Error.exitWithOverview intro outro interfaces

66 Error.exitWithOverview intro outro interfaces

68

67

69 ["--version"] ->

68 ["--version"] ->

70− do hPutStrLn stdout (Pkg.versionToString Compiler.version)

69+ do hPutStrLn stdout (V.toChars V.compiler)

71 Exit.exitSuccess

70 Exit.exitSuccess

72

71

73 command : chunks ->

72 command : chunks ->