Further work

1 files changed, 23 insertions, 3 deletions

diff --git a/interactive-edit-lens/src/Interact/Types.hs b/interactive-edit-lens/src/Interact/Types.hs
index a4d08ac..67f9ae3 100644
--- a/interactive-edit-lens/src/Interact/Types.hs
+++ b/interactive-edit-lens/src/Interact/Types.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TemplateHaskell, DeriveGeneric, StandaloneDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Interact.Types
@@ -6,7 +6,7 @@ module Interact.Types
   , _LeftEditor, _RightEditor, _PrimitiveName
   , Validity, pattern Valid, pattern Invalid
   , InteractState(..)
-  , HasLeft(..), HasRight(..), HasComplement(..), HasFocus(..), HasFocused(..)
+  , HasLeft(..), HasRight(..), HasComplement(..), HasFocus(..), HasFocused(..), HasActive(..), HasLoadBrowser(..)
   , InteractInitial(..)
   , _InitialLeft, _InitialRight, _InitialEmpty
   , InteractConfig(..)
@@ -38,6 +38,7 @@ import Numeric.Natural
 import Brick
 import Brick.Focus
 import Brick.Widgets.Edit
+import Brick.Widgets.FileBrowser
 
 import Control.Lens
 import Control.Lens.TH
@@ -47,12 +48,29 @@ import Control.DFST.Lens
 
 import Data.Text.Zipper.Generic
 
+import Control.DeepSeq
+import GHC.Generics (Generic)
+
+
+deriving instance Generic (StringEdit n c)
+instance (NFData n, NFData c) => NFData (StringEdit n c)
+  
+deriving instance Generic (StringEdits n c)
+instance (NFData n, NFData c) => NFData (StringEdits n c)
+
+deriving instance Generic (DFSTAction s c c')
+instance (NFData s, NFData c, NFData c') => NFData (DFSTAction s c c')
+
+instance (NFData s, NFData c, NFData c') => NFData (DFSTComplement s c c') where
+  rnf = foldr deepseq ()
+
 
 data InteractName
   = LeftEditor
   | RightEditor
+  | LoadBrowser
   | PrimitiveName !Text
-  deriving (Eq, Ord, Show, Read)
+  deriving (Eq, Ord, Show, Read, Generic)
 
 makePrisms ''InteractName
 
@@ -64,6 +82,8 @@ data InteractState c = InteractState
   { istLeft, istRight :: (Last Validity, Last (Seq Char, Int), StringEdits Natural Char)
   , istComplement :: c
   , istFocus :: FocusRing InteractName
+  , istActive :: Bool
+  , istLoadBrowser :: Maybe (FileBrowser InteractName)
   }
 
 makeLensesWith abbreviatedFields ''InteractState