re-parenthesize task chains

elm-lang · Jul 31, 2015 · 2bff271 · 2bff271
1 parent 314fa5f
commit 2bff271
Showing 1 changed file with 48 additions and 46 deletions.
diff --git a/frontend/Debugger/RuntimeApi.elm b/frontend/Debugger/RuntimeApi.elm
@@ -173,62 +173,64 @@ swap : DebugSession
     -> (SGShape -> List NodeId)
     -> Task SwapError DebugSession
 swap session newMod initialNodesFun =
-  (((dispose session)
+  (dispose session)
   `Task.andThen` (\_ ->
-    getInputHistory session
-  ))
-  `Task.andThen` (\history ->
-    initializeFullscreen
-      newMod
-      history
-      (getAddress session)
-      initialNodesFun
-    |> Task.map (\(newSession, _) -> (newSession, history))
-  ))
-  `Task.andThen` (\(newSession, history) ->
-    let
-      nodes =
-        initialNodesFun (sgShape newSession)
-
-      valid =
-        validate history (sgShape session) (sgShape newSession)
-    in
-      case valid of
-        Just swapErr ->
-          Task.fail swapErr
-
-        Nothing ->
-          Task.succeed newSession
+    (getInputHistory session)
+    `Task.andThen` (\history ->
+      (initializeFullscreen
+        newMod
+        history
+        (getAddress session)
+        initialNodesFun
+      )
+      `Task.andThen` (\(newSession, _) ->
+        let
+          nodes =
+            initialNodesFun (sgShape newSession)
+
+          valid =
+            validate history (sgShape session) (sgShape newSession)
+        in
+          case valid of
+            Just swapErr ->
+              Task.fail swapErr
+
+            Nothing ->
+              Task.succeed newSession
+      )
+    )
   )
 
 
 forkFrom : DebugSession
         -> FrameIndex
         -> Task x (DebugSession, ValueSet)
 forkFrom session frameIdx =
-  (((getSubscriptions session)
-  `Task.andThen` (\subs ->
-    getInputHistory session
-     |> Task.map (\history ->
-          ( history |> splitInputHistory frameIdx |> fst
-          , subs
+  (dispose session)
+  `Task.andThen` (\_ ->
+    (getSubscriptions session)
+    `Task.andThen` (\subs ->
+      (getInputHistory session
+       |> Task.map (\history ->
+            history |> splitInputHistory frameIdx |> fst)
+      )
+      `Task.andThen` (\historyUpTo ->
+        (initializeFullscreen
+          (getModule session)
+          historyUpTo
+          (getAddress session)
+          (always subs)
+        )
+        `Task.andThen` (\(newSession, _) ->
+          (getNodeStateSingle
+            newSession
+            frameIdx
+            subs
           )
+          |> Task.map (\values -> (newSession, values))
         )
-  ))
-  `Task.andThen` (\(historyUpTo, subs) ->
-    initializeFullscreen
-      (getModule session)
-      historyUpTo
-      (getAddress session)
-      (always subs)
-    |> Task.map (\(session, values) -> (session, values, subs))
-  ))
-  `Task.andThen` (\(newSession, values, subs) ->
-    getNodeStateSingle
-      newSession
-      frameIdx
-      subs
-    |> Task.map (\vals -> (newSession, vals))
+      )
+    )
   )