Rename functions to match Eve

Author: ChrisPenner

docs/Building-An-Extension.md

@@ -70,7 +70,7 @@ main :: IO ()
 main = rasa $ do
   -- some plugins...
   -- Add the new action here!
-  onInit helloWorld
+  helloWorld
 ```
 
 Okay let's try again! `stack build && stack exec rasa` (you may want to alias
@@ -136,26 +136,26 @@ rasa/rasa-example-config/app/Main.hs:28:10: error:
                 with actual type ‘Keypress -> Action ()’
 ```
 
-Hrmm, right! Now that we're listening for keypress events we don't want to use
-`onInit` anymore, Rasa provides a way to register listeners for different events;
-we'll learn how to listen for any arbitrary event later; but for now it's time for
-`onKeypress`! 
+Hrmm, right! Now that we're listening for keypress events we need to set up an
+event-listener! Rasa provides a way to register listeners for different events;
+we'll learn how to listen for any arbitrary event later; but for now it's time
+for `onKeypress`!
 
 ```haskell
 onKeypress :: (Keypress -> Action ()) -> Action ListenerId
 ```
 
 So we've got our function from our event type (Keypress), so let's try
-registering it using `onKeypress`; we'll do all of this within `onInit` so the
-listener is registered when Rasa starts. The onKeypress function
-returns a reference to the newly created listener so that we could cancel the
-listener using `removeListener` later if we wanted to; but since we don't need
-to do that; we'll just ignore it.
+registering it using `onKeypress`; The onKeypress function returns a reference
+to the newly created listener so that we could cancel the listener using
+`removeListener` later if we wanted to; but since we don't need to do that;
+we'll just ignore it by using `void` from `Control.Monad`.
 
 ```haskell
+import Control.Monad
 main = rasa $ do
   -- other extensions
-  onInit $ onKeypress helloWorld
+  void $ onKeypress helloWorld
 ```
 
 Okay, let's build that and run it, now in a separate terminal we'll run
@@ -213,7 +213,7 @@ import qualified Yi.Rope as Y
 main = rasa $ do
   -- other extensions
   cursors
-  onInit $ onKeypress copyPasta
+  void $ onKeypress copyPasta
 
 copyPasta :: Keypress -> Action ()
 copyPasta (Keypress 'y' _) = focusDo_ $ rangeDo_ copier
@@ -504,7 +504,7 @@ newBuf (BufAdded bufRef) = bufDo_ bufRef (addCopyListener copyListener)
 
 main = rasa $ do
   -- other extensions
-  onInit . onBufAdded $ newBuf
+  onBufAdded_ $ newBuf
 ```
 
 Okay so this works; but there was a bit of boiler-plate to get it going!
@@ -599,7 +599,7 @@ newtype Copied = Copied String
 -- We've renamed things so we can export a single 'Action'
 -- that the user can embed in their config.
 copyPasta :: Action ()
-copyPasta = onInit $ onKeypress keyListener
+copyPasta = void $ onKeypress keyListener
 
 keyListener :: Keypress -> Action ()
 keyListener (Keypress 'y' _) = do

rasa-ext-cursors/src/Rasa/Ext/Cursors.hs

@@ -27,5 +27,5 @@ import Rasa.Ext.Cursors.Internal.Actions
 
 -- | Registers listeners for the extension. The user should add this to their config.
 cursors :: App ()
-cursors = onInit . onBufAdded $
+cursors = onBufAdded_ $
   \(BufAdded bufRef) -> bufDo_ bufRef setStyleProvider

rasa-ext-logger/src/Rasa/Ext/Logger.hs

@@ -10,7 +10,7 @@ import Control.Monad.State
 
 logger :: App ()
 logger = do
-  onInit $ liftIO $ writeFile "logs.log" "Event Log\n"
+  liftIO $ writeFile "logs.log" "Event Log\n"
   onEveryRender_ $ return ()
     -- ed <- getEditor
     -- liftIO $ appendFile "logs.log" (show ed)

rasa-ext-slate/src/Rasa/Ext/Slate.hs

@@ -17,7 +17,7 @@ import Control.Monad.IO.Class
 -- >    ...
 slate :: App ()
 slate = do
-  onInit terminalEvents
+  terminalEvents
   onEveryRender_ renderAll
   onExit shutdown
 

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

@@ -106,7 +106,7 @@ focusedBufs = do
 -- | Returns whether the current buffer is focused in at least one view.
 isFocused :: BufAction Bool
 isFocused = do
-  inFocus <- liftAction focusedBufs
+  inFocus <- liftApp focusedBufs
   br <- getBufRef
   return $ br `elem` inFocus
 

rasa-ext-vim/src/Rasa/Ext/Vim.hs

@@ -80,9 +80,9 @@ handleKeypress keypress = focusDo_ $ do
 
 -- | Listeners for keypresses that run regardless of current mode.
 anyMode :: [Keypress] -> BufAction ()
-anyMode [Keypress 'c' [Ctrl]] = liftAction exit
-anyMode [KPageDown []] = liftAction $ scrollBy 14 -- Page down
-anyMode [KPageUp []] = liftAction $ scrollBy (-14) -- Page up
+anyMode [Keypress 'c' [Ctrl]] = liftApp exit
+anyMode [KPageDown []] = liftApp $ scrollBy 14 -- Page down
+anyMode [KPageUp []] = liftApp $ scrollBy (-14) -- Page up
 anyMode [KHome []] = startOfLine
 anyMode [KEnd []] = endOfLine
 anyMode _ = return ()
@@ -110,22 +110,22 @@ normal [Keypress 'g' [], Keypress 'g' []] = setRanges [Range (Coord 0 0) (Coord
 normal [Keypress 's' []] = addHist $ Keypress 's' []
 normal [Keypress 's' [], Keypress 'n' []] = toggleLineNumbers
 
-normal [Keypress '+' []] = liftAction nextBuf
-normal [Keypress '-' []] = liftAction prevBuf
-normal [Keypress 'w' [Ctrl]] = liftAction hSplit
-normal [Keypress 'v' [Ctrl]] = liftAction vSplit
-normal [Keypress 'o' [Ctrl]] = liftAction closeInactive
-normal [Keypress 'r' [Ctrl]] = liftAction rotate
-
-normal [Keypress 'e' [Ctrl]] = liftAction $ scrollBy 1 -- Scroll down
-normal [Keypress 'd' [Ctrl]] = liftAction $ scrollBy 7 -- Half-Page down
-normal [Keypress 'y' [Ctrl]] = liftAction $ scrollBy (-1) -- Scroll up
-normal [Keypress 'u' [Ctrl]] = liftAction $ scrollBy (-7) -- Half-Page up
-
-normal [KLeft []] = liftAction focusViewLeft
-normal [KRight []] = liftAction focusViewRight
-normal [KUp []] = liftAction focusViewAbove
-normal [KDown []] = liftAction focusViewBelow
+normal [Keypress '+' []] = liftApp nextBuf
+normal [Keypress '-' []] = liftApp prevBuf
+normal [Keypress 'w' [Ctrl]] = liftApp hSplit
+normal [Keypress 'v' [Ctrl]] = liftApp vSplit
+normal [Keypress 'o' [Ctrl]] = liftApp closeInactive
+normal [Keypress 'r' [Ctrl]] = liftApp rotate
+
+normal [Keypress 'e' [Ctrl]] = liftApp $ scrollBy 1 -- Scroll down
+normal [Keypress 'd' [Ctrl]] = liftApp $ scrollBy 7 -- Half-Page down
+normal [Keypress 'y' [Ctrl]] = liftApp $ scrollBy (-1) -- Scroll up
+normal [Keypress 'u' [Ctrl]] = liftApp $ scrollBy (-7) -- Half-Page up
+
+normal [KLeft []] = liftApp focusViewLeft
+normal [KRight []] = liftApp focusViewRight
+normal [KUp []] = liftApp focusViewAbove
+normal [KDown []] = liftApp focusViewBelow
 
 
 normal [Keypress 'G' []] = do

rasa/src/Rasa.hs

@@ -5,6 +5,7 @@ import Eve
 import Rasa.Internal.Listeners
 
 import Control.Monad
+import Data.Default
 
 -- | The main function to run rasa.
 --

rasa/src/Rasa/Ext.hs

@@ -26,10 +26,8 @@
 -- >
 -- > logger :: Action ()
 -- > logger = do
--- >   onInit $ liftIO $ writeFile "logs" "==Logs==\n"
--- >   -- Listeners should also be registered using 'onInit'.
--- >   -- It ensures all listeners are ready before any actions occur.
--- >   onInit $ onKeypress logKeypress
+-- >   liftIO $ writeFile "logs" "==Logs==\n"
+-- >   onKeypress logKeypress
 -- >   onExit $ liftIO $ appendFile "logs" "==Done=="
 --
 -- Check out this tutorial on building extensions, it's also just a great way to learn

rasa/src/Rasa/Internal/BufActions.hs

@@ -97,8 +97,8 @@ overBufExt :: (Typeable s, Show s, Default s) => (s -> s) -> BufAction ()
 overBufExt f = stateLens %= f
 
 -- -- | This lifts up an 'Action' to be run inside a 'BufAction'
--- liftAction :: App r -> BufAction r
--- liftAction action = liftBufAction $ LiftAction action id
+-- liftApp :: App r -> BufAction r
+-- liftApp action = liftBufAction $ LiftAction action id
 
 -- | Runs function over given range of text
 overRange :: CrdRange -> (Y.YiString -> Y.YiString) -> BufAction ()

stack.yaml

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