Switch some naming from eve ext -> state

Author: ChrisPenner

rasa-ext-cmd/src/Rasa/Ext/Cmd.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE TemplateHaskell #-}
-
 module Rasa.Ext.Cmd
   ( addCmd
   , runCmd
@@ -26,12 +24,12 @@ instance Default Cmd where
 -- TODO try switching to T.Text -> (T.Text -> a) -> App ()
 addCmd :: String -> (String -> App ()) -> App ()
 addCmd alias mkEvent =
-  ext %= add
+  stateLens %= add
     where add (Cmd commands) = Cmd $ commands & at alias ?~ mkEvent
 
 runCmd :: String -> String -> App ()
 runCmd alias args = do
-  Cmd commands <- use ext
+  Cmd commands <- use stateLens
   let mCmd = commands^.at alias
   case mCmd of
     Just cmd -> cmd args

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

@@ -16,13 +16,13 @@ initUi :: App V.Vty
 initUi = do
   cfg <- liftIO V.standardIOConfig
   v <- liftIO $ V.mkVty cfg
-  ext .= Just (Slate v)
+  stateLens .= Just (Slate v)
   return v
 
 -- | Gets vty by checking if it has been initialized yet, if not it runs the initialization.
 getVty :: App V.Vty
 getVty = do
-  v <- use ext
+  v <- use stateLens
   case v of
     Just (Slate v') -> return v'
     Nothing -> initUi

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

@@ -126,18 +126,18 @@ instance Default Views where
 -- | Gets the stored views
 getViews :: App (Maybe Window)
 getViews = do
-  Views mWin <- use ext
+  Views mWin <- use stateLens
   return mWin
 
 -- | Sets the stored views
 setViews :: Maybe Window -> App ()
-setViews v = ext .= Views v
+setViews v = stateLens .= Views v
 
 -- | Run function over stored windows
 overWindows :: (Window -> Window) -> App ()
 overWindows f = do
-  Views mWin <- use ext
-  ext .= (Views $ fmap f mWin)
+  Views mWin <- use stateLens
+  stateLens .= (Views $ fmap f mWin)
 
 -- | Flip all Horizontal splits to Vertical ones and vice versa.
 rotate :: Window -> Window

rasa/src/Rasa/Internal/BufActions.hs

@@ -85,16 +85,16 @@ getBufRef :: BufAction BufRef
 getBufRef = use ref
 
 -- | Retrieve some buffer extension state
-getBufExt :: (Typeable ext, Show ext, Default ext) => BufAction ext
-getBufExt = use ext
+getBufExt :: (Typeable s, Show s, Default s) => BufAction s
+getBufExt = use stateLens
 
 -- | Set some buffer extension state
-setBufExt :: (Typeable ext, Show ext, Default ext) => ext -> BufAction ()
-setBufExt newExt = ext .= newExt
+setBufExt :: (Typeable s, Show s, Default s) => s -> BufAction ()
+setBufExt newExt = stateLens .= newExt
 
 -- | Set some buffer extension state
-overBufExt :: (Typeable ext, Show ext, Default ext) => (ext -> ext) -> BufAction ()
-overBufExt f = ext %= f
+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

rasa/src/Rasa/Internal/Buffer.hs

@@ -48,19 +48,19 @@ instance Default NextBufId where
   def = NextBufId 0
 
 makeLenses ''NextBufId
-nextBufId :: HasExts s => Lens' s Int
-nextBufId = ext.nextBufId'
+nextBufId :: HasStates s => Lens' s Int
+nextBufId = stateLens.nextBufId'
 
 -- | A buffer, holds the text in the buffer and any extension states that are set on the buffer.
 data Buffer = Buffer
   { _text' :: Y.YiString
-  , _bufExts' :: Exts
+  , _bufStates' :: States
   , _ref :: BufRef
   }
 makeLenses ''Buffer
 
-instance HasExts Buffer where
-  exts = bufExts'
+instance HasStates Buffer where
+  states = bufStates'
 
 instance HasEvents Buffer where
 
@@ -79,7 +79,7 @@ instance Show Buffer where
   show b = "text:" ++ (Y.toString . Y.take 30 $ (b^.text)) ++ "...,\n"
            ++ "exts: " ++ extText ++ "}>\n"
     where
-      extText = intercalate "\n" $ show <$> b^.exts.to M.toList
+      extText = intercalate "\n" $ show <$> b^.states.to M.toList
 
 type BufAction a = Action Buffer a
 
@@ -92,14 +92,14 @@ instance Default Buffers where
   def = Buffers mempty
 
 -- | A lens over the map of available buffers
-buffers :: HasExts s => Lens' s (IM.IntMap Buffer)
-buffers = ext.buffers'
+buffers :: HasStates s => Lens' s (IM.IntMap Buffer)
+buffers = stateLens.buffers'
 
 -- | Creates a new buffer from the given text.
 mkBuffer :: Y.YiString -> BufRef -> Buffer
 mkBuffer txt bRef =
   Buffer
     { _text' = txt
-    , _bufExts' = mempty
+    , _bufStates' = mempty
     , _ref = bRef
     }

stack.yaml

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