Working with Eve

Author: ChrisPenner

rasa-example-config/rasa-example-config.cabal

@@ -28,7 +28,7 @@ executable rasa
                      , data-default
                      , yi-rope
                      , mtl
-                     , reflex
+                     , eve
   default-language:    Haskell2010
   ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
 

rasa-ext-views/src/Rasa/Ext/Views/Internal/Actions.hs

@@ -23,7 +23,6 @@ import Rasa.Ext.Views.Internal.BiTree
 
 import Control.Lens
 import Control.Monad
-import Control.Monad.State
 import Data.Maybe
 import Data.List
 

rasa/rasa.cabal

@@ -64,7 +64,7 @@ library
 
   ghc-options:         -Wall
   build-depends:       base >= 4.8 && < 5
-                     , reflex
+                     , eve
                      , async
                      , bifunctors
                      , profunctors

rasa/src/Rasa.hs

@@ -1,16 +1,10 @@
 {-# language ExistentialQuantification, Rank2Types, ScopedTypeVariables #-}
 module Rasa (rasa) where
 
-import Reflex
+import Eve
 import Rasa.Internal.Listeners
 
 import Control.Monad
-import Control.Monad.IO.Class
-import Data.Maybe
-
-import Pipes
-import Pipes.Concurrent
-import Pipes.Parse
 
 -- | The main function to run rasa.
 --
@@ -25,32 +19,8 @@ import Pipes.Parse
 -- >   slate
 
 rasa :: App () -> IO ()
-rasa initialization = void $ reflex (initialization >> hooks)
+rasa initialization = void $ eve (initialization >> hooks)
   where hooks = beforeEvent_ $ do
           dispatchBeforeRender
           dispatchOnRender
           dispatchAfterRender
-
--- rasa :: Action () -> IO ()
--- rasa initialize = do
---   (output, input) <- spawn unbounded
---   evalAction (mkActionState output) $ do
---     initialize
---     dispatchInit
---     dispatchAfterInit
---     eventLoop $ fromInput input
---     dispatchExit
-
--- -- | This is the main event loop, it runs recursively forever until something
--- -- sets 'Rasa.Editor.exiting'. It runs the pre-event listeners, then checks if any
--- -- async events have finished, then runs the post event listeners and repeats.
--- eventLoop :: Producer (Action ()) IO () -> Action ()
--- eventLoop producer = do
---   dispatchBeforeRender
---   dispatchOnRender
---   dispatchAfterRender
---   dispatchBeforeEvent
---   (mAction, nextProducer) <- liftIO $ runStateT draw producer
---   fromMaybe (return ()) mAction
---   isExiting <- shouldExit
---   unless isExiting $ eventLoop nextProducer

rasa/src/Rasa/Ext.hs

@@ -157,10 +157,10 @@ module Rasa.Ext
   , RenderInfo(..)
   , Renderable(..)
 
-  , module Reflex
+  , module Eve
   ) where
 
-import Reflex
+import Eve
 import Rasa.Internal.BufActions
 import Rasa.Internal.Buffer
 import Rasa.Internal.Events

rasa/src/Rasa/Internal/BufActions.hs

@@ -1,4 +1,5 @@
 {-# language OverloadedStrings #-}
+{-# language RankNTypes #-}
 module Rasa.Internal.BufActions
   ( overRange
   , replaceRange
@@ -46,17 +47,15 @@ module Rasa.Internal.BufActions
 
   ) where
 
-import Reflex
+import Eve
 
 import Rasa.Internal.Buffer
 import Rasa.Internal.Range
 import Rasa.Internal.Text
 import Rasa.Internal.Events
-import Rasa.Internal.Listeners
 
 import Control.Lens
 import Control.Monad
-import Control.Monad.State
 import Data.Maybe
 import Data.Default
 import Data.Typeable
@@ -151,18 +150,11 @@ getBuffer (BufRef bufInd) =
 --
 -- Result list is not guaranteed to be the same length or positioning as input BufRef list; some buffers may no
 -- longer exist.
--- TODO!!!
 bufferDo :: [BufRef] -> BufAction r -> App [r]
 bufferDo bufRefs bufAct = do
-  results <- forM bufRefs $ \(BufRef bInd) -> do
-    zoomer (buffers.at bInd._Just) ((:[]) <$> bufAct)
-  return . concat $ results
-
-zoomer l act = do
-  s <- get
-  (r, s) <- get >>= runStateT (zoom l act)
-  put s
-  return r
+  r <- forM bufRefs $ \(BufRef bInd) ->
+    runAction (buffers.at bInd._Just) ((:[]) <$> bufAct)
+  return $ concat r
 
 -- | This lifts a 'Rasa.App.BufAction' to an 'Rasa.App.App' which
 -- performs the 'Rasa.App.BufAction' on every buffer and collects the return

rasa/src/Rasa/Internal/Buffer.hs

@@ -24,14 +24,12 @@ module Rasa.Internal.Buffer
   ) where
 
 
-import Reflex
+import Eve
 
 import qualified Yi.Rope as Y
 import Control.Lens hiding (matching)
-import Control.Monad.State
 import qualified Data.Map as M
 import qualified Data.IntMap as IM
-import Data.Maybe
 import Data.List
 import Data.Default
 
@@ -83,7 +81,7 @@ instance Show Buffer where
     where
       extText = intercalate "\n" $ show <$> b^.exts.to M.toList
 
-type BufAction a = StateT Buffer App a
+type BufAction a = Action Buffer a
 
 newtype Buffers = Buffers
   { _buffers' :: IM.IntMap Buffer

rasa/src/Rasa/Internal/Events.hs

@@ -1,12 +1,8 @@
 {-# language ExistentialQuantification #-}
 module Rasa.Internal.Events
-  ( Init(..)
-  , AfterInit(..)
-  , BeforeEvent(..)
-  , BeforeRender(..)
+  ( BeforeRender(..)
   , OnRender(..)
   , AfterRender(..)
-  , Exit(..)
   , BufAdded(..)
   , Keypress(..)
   , Mod(..)
@@ -18,16 +14,6 @@ import Rasa.Internal.Range
 import Rasa.Internal.Buffer
 import qualified Yi.Rope as Y
 
--- | This event is dispatched exactly once when the editor starts up.
-data Init = Init deriving (Show, Eq, Typeable)
-
--- | This event is dispatched exactly once when the editor starts up after onInit has occurred.
-data AfterInit = AfterInit deriving (Show, Eq, Typeable)
-
--- | This event is dispatched immediately before dispatching any events from
--- asyncronous event listeners (like 'Keypress's)
-data BeforeEvent = BeforeEvent deriving (Show, Eq, Typeable)
-
 -- | This event is dispatched immediately before dispatching
 -- the 'OnRender' event.
 data BeforeRender = BeforeRender deriving (Show, Eq, Typeable)
@@ -38,10 +24,6 @@ data OnRender = OnRender deriving (Show, Eq, Typeable)
 -- | This event is dispatched immediately after dispatching 'OnRender'.
 data AfterRender = AfterRender deriving (Show, Eq, Typeable)
 
--- | This event is dispatched before exiting the editor, listen for this to do
--- any clean-up (saving files, etc.)
-data Exit = Exit deriving (Show, Eq, Typeable)
-
 -- | This event is dispatched after adding a new buffer. The contained BufRef refers to the new buffer.
 data BufAdded = BufAdded BufRef deriving (Show, Eq, Typeable)
 

rasa/src/Rasa/Internal/Listeners.hs

@@ -24,17 +24,10 @@ module Rasa.Internal.Listeners
   , dispatchKeypress
   ) where
 
-import Reflex
-import Rasa.Internal.Buffer
+import Eve
 import Rasa.Internal.Events
 
-import Control.Lens
 import Control.Monad
-import Control.Monad.State
-import Data.Default
-import Data.Typeable
-import Data.Maybe
-import qualified Data.Map as M
 
 -- | Trigger an 'App' on a 'Keypress'
 onKeypress :: (Keypress -> App result) -> App ListenerId

rasa/src/Rasa/Internal/Styles.hs

@@ -13,7 +13,7 @@ module Rasa.Internal.Styles
   , getStyles
   ) where
 
-import Reflex
+import Eve
 import Rasa.Internal.Range
 import Rasa.Internal.Buffer
 import Rasa.Internal.BufActions

rasa/src/Rasa/Internal/Utility.hs

@@ -11,7 +11,7 @@ module Rasa.Internal.Utility
   , styleText
   ) where
 
-import Reflex
+import Eve
 import Rasa.Internal.Styles
 import Rasa.Internal.BufActions
 import Rasa.Internal.Buffer

rasa/src/Rasa/Testing.hs

@@ -2,7 +2,7 @@ module Rasa.Testing (
   -- testBufAction
   ) where
 
--- import Reflex
+-- import Eve
 -- import Rasa.Internal.Interpreters
 -- import Rasa.Internal.Buffer
 

stack.yaml

@@ -18,9 +18,9 @@ packages:
 - ./rasa-ext-vim
 - ./rasa-example-config
 - ./text-lens
-- ../reflex
 
 extra-deps:
+- eve-0.1.0
 - vty-5.14
 - recursion-schemes-5.0.1