remove Debug.todos #12

bin/index.js

@@ -294,6 +294,11 @@ const io = {
       this.send({ index, value: answer });
     });
   },
+  replGetInputLineWithInitial: function (index, prompt, left, right) {
+    rl.question(prompt + left + right, (answer) => {
+      this.send({ index, value: answer });
+    });
+  },
   procWithCreateProcess: function (index, createProcess) {
     // FIXME needs review, only trying to implement the minimum for repl functionality
     const file = tmp.fileSync();

src/Builder/Build.elm

@@ -10,6 +10,9 @@ module Builder.Build exposing
     , fromPaths
     , fromRepl
     , getRootNames
+    , ignoreDocs
+    , keepDocs
+    , writeDocs
     )
 
 import Builder.Elm.Details as Details
@@ -142,7 +145,7 @@ fromExposed docsDecoder docsEncoder style root details docsGoal ((NE.Nonempty e
                                                     docsNeed =
                                                         toDocsNeed docsGoal
                                                 in
-                                                Utils.mapFromKeysA (fork statusEncoder << crawlModule env mvar docsNeed) (e :: es)
+                                                Map.fromKeysA compare (fork statusEncoder << crawlModule env mvar docsNeed) (e :: es)
                                                     |> IO.bind
                                                         (\roots ->
                                                             Utils.putMVar statusDictEncoder mvar roots
@@ -1142,10 +1145,25 @@ addImportProblems results name problems =
 -- DOCS
 
 
-type DocsGoal a
-    = KeepDocs
-    | WriteDocs FilePath
-    | IgnoreDocs
+type DocsGoal docs
+    = KeepDocs (Dict ModuleName.Raw BResult -> docs)
+    | WriteDocs (Dict ModuleName.Raw BResult -> IO docs)
+    | IgnoreDocs docs
+
+
+keepDocs : DocsGoal (Dict ModuleName.Raw Docs.Module)
+keepDocs =
+    KeepDocs (Utils.mapMapMaybe compare toDocs)
+
+
+writeDocs : FilePath -> DocsGoal ()
+writeDocs path =
+    WriteDocs (E.writeUgly path << Docs.encode << Utils.mapMapMaybe compare toDocs)
+
+
+ignoreDocs : DocsGoal ()
+ignoreDocs =
+    IgnoreDocs ()
 
 
 type DocsNeed
@@ -1155,13 +1173,13 @@ type DocsNeed
 toDocsNeed : DocsGoal a -> DocsNeed
 toDocsNeed goal =
     case goal of
-        IgnoreDocs ->
+        IgnoreDocs _ ->
             DocsNeed False
 
         WriteDocs _ ->
             DocsNeed True
 
-        KeepDocs ->
+        KeepDocs _ ->
             DocsNeed True
 
 
@@ -1181,14 +1199,15 @@ makeDocs (DocsNeed isNeeded) modul =
 
 finalizeDocs : DocsGoal docs -> Dict ModuleName.Raw BResult -> IO docs
 finalizeDocs goal results =
-    -- case goal of
-    --     KeepDocs ->
-    --         IO.pure <| Utils.mapMapMaybe toDocs results
-    --     WriteDocs path ->
-    --         E.writeUgly path <| Docs.encode <| Utils.mapMapMaybe toDocs results
-    --     IgnoreDocs ->
-    --         IO.pure ()
-    Debug.todo "finalizeDocs"
+    case goal of
+        KeepDocs f ->
+            IO.pure <| f results
+
+        WriteDocs f ->
+            f results
+
+        IgnoreDocs val ->
+            IO.pure val
 
 
 toDocs : BResult -> Maybe Docs.Module

src/Compiler/Data/Map/Utils.elm

@@ -1,10 +1,13 @@
 module Compiler.Data.Map.Utils exposing
     ( any
     , fromKeys
+    , fromKeysA
     , fromValues
     )
 
+import Data.IO as IO exposing (IO)
 import Data.Map as Dict exposing (Dict)
+import Utils.Main as Utils
 
 
 
@@ -16,6 +19,11 @@ fromKeys toValue keys =
     Dict.fromList compare (List.map (\k -> ( k, toValue k )) keys)
 
 
+fromKeysA : (k -> k -> Order) -> (k -> IO v) -> List k -> IO (Dict k v)
+fromKeysA keyComparison toValue keys =
+    IO.fmap (Dict.fromList keyComparison) (Utils.listTraverse (\k -> IO.fmap (Tuple.pair k) (toValue k)) keys)
+
+
 fromValues : (v -> comparable) -> List v -> Dict comparable v
 fromValues toKey values =
     Dict.fromList compare (List.map (\v -> ( toKey v, v )) values)

src/Compiler/Elm/Docs.elm

@@ -356,11 +356,8 @@ chompOverview names =
         |> P.bind
             (\isDocs ->
                 if isDocs then
-                    let
-                        _ =
-                            Space.chomp E.Space
-                    in
-                    P.bind chompOverview (chompDocs names)
+                    Space.chomp E.Space
+                        |> P.bind (\_ -> P.bind chompOverview (chompDocs names))
 
                 else
                     P.pure names

src/Compiler/Parse/Space.elm

@@ -297,7 +297,7 @@ docComment toExpectation toSpaceError =
                     MultiGood ->
                         let
                             off =
-                                pos3 - pos
+                                pos3
 
                             len =
                                 newPos - pos3 - 2

src/Compiler/Reporting/Error.elm

@@ -303,7 +303,7 @@ errorEncoder error =
         BadDocs docsErr ->
             Encode.object
                 [ ( "type", Encode.string "BadDocs" )
-                , ( "errs", Docs.errorEncoder docsErr )
+                , ( "docsErr", Docs.errorEncoder docsErr )
                 ]
 
 

src/Data/IO.elm

@@ -123,6 +123,7 @@ type Effect
     | TakeMVar Int
     | PutMVar Int Encode.Value
     | ReplGetInputLine String
+    | ReplGetInputLineWithInitial String ( String, String )
     | HClose Handle
     | StateGet
     | ProcWithCreateProcess CreateProcess

src/Terminal/Bump.elm

@@ -182,7 +182,7 @@ generateDocs root (Outline.PkgOutline _ _ _ _ exposed _ _ _) =
 
                     e :: es ->
                         Task.eio Exit.BumpBadBuild <|
-                            Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.KeepDocs (NE.Nonempty e es)
+                            Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.keepDocs (NE.Nonempty e es)
             )
 
 

src/Terminal/Diff.elm

@@ -215,7 +215,7 @@ generateDocs (Env maybeRoot _ _ _) =
 
                                     e :: es ->
                                         Task.eio Exit.DiffBadBuild <|
-                                            Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.KeepDocs (NE.Nonempty e es)
+                                            Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.keepDocs (NE.Nonempty e es)
                     )
 
 

src/Terminal/Main.elm

@@ -409,6 +409,16 @@ effectToCmd index portOut effect =
                         ]
                 }
 
+        IO.ReplGetInputLineWithInitial prompt ( left, right ) ->
+            portOut
+                { index = index
+                , value =
+                    Encode.object
+                        [ ( "fn", Encode.string "replGetInputLineWithInitial" )
+                        , ( "args", Encode.list Encode.string [ prompt, left, right ] )
+                        ]
+                }
+
         IO.HClose (IO.Handle fd) ->
             portOut
                 { index = index

src/Terminal/Make.elm

@@ -204,7 +204,7 @@ buildExposed : Reporting.Style -> FilePath -> Details.Details -> Maybe FilePath
 buildExposed style root details maybeDocs exposed =
     let
         docsGoal =
-            Maybe.maybe Build.IgnoreDocs Build.WriteDocs maybeDocs
+            Maybe.maybe Build.ignoreDocs Build.writeDocs maybeDocs
     in
     Task.eio Exit.MakeCannotBuild <|
         Build.fromExposed (Decode.succeed ()) (\_ -> Encode.object []) style root details docsGoal exposed

src/Terminal/Publish.elm

@@ -235,7 +235,7 @@ verifyBuild root =
                                     |> Task.bind
                                         (\exposed ->
                                             Task.eio Exit.PublishBuildProblem <|
-                                                Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.KeepDocs exposed
+                                                Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.keepDocs exposed
                                         )
                             )
                     )
@@ -416,7 +416,7 @@ verifyZipBuild root =
                                 |> Task.bind
                                     (\exposed ->
                                         Task.eio Exit.PublishZipBuildProblem
-                                            (Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.KeepDocs exposed)
+                                            (Build.fromExposed Docs.jsonDecoder Docs.jsonEncoder Reporting.silent root details Build.keepDocs exposed)
                                             |> Task.fmap (\_ -> ())
                                     )
                         )

src/Terminal/Repl.elm

@@ -204,24 +204,25 @@ read =
 
 readMore : Lines -> Prefill -> Utils.ReplInputT Input
 readMore previousLines prefill =
-    -- Utils.replGetInputLineWithInitial "| " ( renderPrefill prefill, "" )
-    --     |> IO.bind
-    --         (\input ->
-    --             case input of
-    --                 Nothing ->
-    --                     IO.pure Skip
-    --                 Just chars ->
-    --                     let
-    --                         lines =
-    --                             addLine (stripLegacyBackslash chars) previousLines
-    --                     in
-    --                     case categorize lines of
-    --                         Done doneInput ->
-    --                             IO.pure doneInput
-    --                         Continue p ->
-    --                             readMore lines p
-    --         )
-    Debug.todo "readMore"
+    Utils.replGetInputLineWithInitial "| " ( renderPrefill prefill, "" )
+        |> IO.bind
+            (\input ->
+                case input of
+                    Nothing ->
+                        IO.pure Skip
+
+                    Just chars ->
+                        let
+                            lines =
+                                addLine (stripLegacyBackslash chars) previousLines
+                        in
+                        case categorize lines of
+                            Done doneInput ->
+                                IO.pure doneInput
+
+                            Continue p ->
+                                readMore lines p
+            )
 
 
 
@@ -269,9 +270,9 @@ type Lines
     = Lines String (List String)
 
 
-addLine : List Char -> Lines -> Lines
+addLine : String -> Lines -> Lines
 addLine line (Lines x xs) =
-    Lines (String.fromList line) (x :: xs)
+    Lines line (x :: xs)
 
 
 isBlank : Lines -> Bool

src/Utils/Main.elm

@@ -89,7 +89,6 @@ module Utils.Main exposing
     , mVarEncoder
     , mapFindMin
     , mapFromKeys
-    , mapFromKeysA
     , mapFromListWith
     , mapInsertWith
     , mapIntersectionWith
@@ -211,11 +210,6 @@ fpAddExtension path extension =
         path ++ "." ++ extension
 
 
-mapFromKeysA : (k -> IO v) -> List k -> IO (Dict k v)
-mapFromKeysA _ _ =
-    Debug.todo "mapFromKeysA"
-
-
 mapFromListWith : (k -> k -> Order) -> (a -> a -> a) -> List ( k, a ) -> Dict k a
 mapFromListWith keyComparison f =
     List.foldl
@@ -1224,8 +1218,8 @@ replGetInputLine prompt =
 
 
 replGetInputLineWithInitial : String -> ( String, String ) -> ReplInputT (Maybe String)
-replGetInputLineWithInitial =
-    Debug.todo "replGetInputLineWithInitial"
+replGetInputLineWithInitial prompt ( left, right ) =
+    IO.make (Decode.maybe Decode.string) (IO.ReplGetInputLineWithInitial prompt ( left, right ))