Add submodule Ghcitui for all library components

Potentially, we should re-export the important bits. But for now this
seems to work fine.

app/AppState.hs

@@ -38,9 +38,9 @@ import qualified Lens.Micro as Lens
 import AppConfig (AppConfig (..), resolveStartupSplashPath)
 import qualified AppInterpState as AIS
 import AppTopLevel (AppName (..))
-import Ghcid.Daemon (toggleBreakpointLine)
-import qualified Ghcid.Daemon as Daemon
-import qualified Loc
+import Ghcitui.Ghcid.Daemon (toggleBreakpointLine)
+import qualified Ghcitui.Ghcid.Daemon as Daemon
+import qualified Ghcitui.Loc as Loc
 import qualified Util
 
 data ActiveWindow

app/BrickUI.hs

@@ -33,10 +33,10 @@ import AppState
 import qualified AppState
 import AppTopLevel (AppName (..))
 import qualified Events
-import qualified Ghcid.Daemon as Daemon
+import qualified Ghcitui.Ghcid.Daemon as Daemon
 import qualified HelpText
-import qualified Loc
-import qualified NameBinding
+import qualified Ghcitui.Loc as Loc
+import qualified Ghcitui.NameBinding as NameBinding
 import qualified Util
 
 -- | Alias for 'AppState AppName' convenience.

app/Events.hs

@@ -19,8 +19,8 @@ import AppState
 import AppTopLevel
     ( AppName (..)
     )
-import qualified Ghcid.Daemon as Daemon
-import qualified Loc
+import qualified Ghcitui.Ghcid.Daemon as Daemon
+import qualified Ghcitui.Loc as Loc
 import Util (showT)
 
 -- | Handle any Brick event and update the state.

ghcitui.cabal

@@ -79,11 +79,11 @@ library ghcitui-lib
                         , string-interpolate ^>= 0.3.2.1
                         , text ^>= 2.0.2
                         , transformers ^>= 0.6.1.0
-    exposed-modules:    Ghcid.Daemon
-                        , Ghcid.ParseContext
-                        , Loc
-                        , Util
-                        , NameBinding
+    exposed-modules:    Ghcitui.Ghcid.Daemon
+                        , Ghcitui.Ghcid.ParseContext
+                        , Ghcitui.Loc
+                        , Ghcitui.Util
+                        , Ghcitui.NameBinding
     ghc-options:        -Wall
                         -Wcompat
                         -Wincomplete-record-updates

lib/Ghcitui/Ghcid/Daemon.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE QuasiQuotes #-}
 
-module Ghcid.Daemon
+module Ghcitui.Ghcid.Daemon
     ( -- * The interpreter state
       InterpState
         ( func
@@ -60,11 +60,11 @@ import qualified Data.Text.IO as T
 import qualified Language.Haskell.Ghcid as Ghcid
 import System.IO (stderr)
 
-import qualified Ghcid.ParseContext as ParseContext
-import qualified Loc
-import qualified NameBinding
-import Util (showT)
-import qualified Util
+import qualified Ghcitui.Ghcid.ParseContext as ParseContext
+import qualified Ghcitui.Loc as Loc
+import qualified Ghcitui.NameBinding as NameBinding
+import Ghcitui.Util (showT)
+import qualified Ghcitui.Util as Util
 
 newtype LogLevel = LogLevel Int deriving (Eq, Ord, Show)
 

lib/Ghcitui/Ghcid/ParseContext.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE QuasiQuotes #-}
 
-module Ghcid.ParseContext
+module Ghcitui.Ghcid.ParseContext
     ( ParseContextOut (..)
     , ParseContextReturn (..)
     , NameBinding (..)
@@ -27,9 +27,9 @@ import Safe (readNote)
 import Text.Regex.TDFA (MatchResult (..), (=~~))
 import qualified Text.Regex.TDFA as Regex
 
-import qualified Loc
-import NameBinding
-import Util
+import qualified Ghcitui.Loc as Loc
+import Ghcitui.NameBinding
+import Ghcitui.Util
 
 ghcidPrompt :: T.Text
 ghcidPrompt = "#~GHCID-START~#"

lib/Ghcitui/Loc.hs

@@ -1,4 +1,4 @@
-module Loc
+module Ghcitui.Loc
     ( -- * Code locations within a file
 
     -- Types and functions for handling code within a single file or module.

lib/Ghcitui/NameBinding.hs

@@ -1,4 +1,4 @@
-module NameBinding (NameBinding (..), BindingValue (..), renderNamesTxt) where
+module Ghcitui.NameBinding (NameBinding (..), BindingValue (..), renderNamesTxt) where
 
 import qualified Data.Text as T
 

lib/Ghcitui/Util.hs

@@ -1,4 +1,4 @@
-module Util (showT, splitBy, linesToText) where
+module Ghcitui.Util (showT, splitBy, linesToText) where
 
 import Data.Text (Text, breakOn, drop, length, pack)
 import Prelude hiding (drop, length)

test/LocSpec.hs

@@ -2,7 +2,7 @@
 
 module LocSpec where
 
-import Loc
+import Ghcitui.Loc
 import Test.Hspec
 
 spec :: Spec

test/UtilSpec.hs

@@ -4,7 +4,7 @@ module UtilSpec where
 
 import Test.Hspec
 
-import Util
+import Ghcitui.Util
 
 spec :: Spec
 spec = do