Make Yi.Core less kitchen-sinky.

yi/src/library/Yi.hs

@@ -21,32 +21,40 @@ module Yi
   (
     module Data.Prototype, -- prototypes are mainly there for config; makes sense to export them.
     module Yi.Boot,
+    module Yi.Buffer,
     module Yi.Config,
+    module Yi.Config.Default,
     module Yi.Core,
     module Yi.Dired,
+    module Yi.Editor,
     module Yi.Eval,
     module Yi.File,
-    module Yi.Config.Default,
-    module Yi.Search,
-    module Yi.Style,
-    module Yi.Style.Library,
+    module Yi.Keymap,
+    module Yi.Keymap.Keys,
     module Yi.Misc,
     module Yi.Mode.Haskell,
     module Yi.Mode.IReader,
+    module Yi.Search,
+    module Yi.Style,
+    module Yi.Style.Library,
   ) where
 
 import Data.Prototype
 import Yi.Boot
+import Yi.Buffer
 import Yi.Config
+import Yi.Config.Default
 import Yi.Core
 import Yi.Dired
+import Yi.Editor
 import Yi.Eval
 import Yi.File
-import Yi.Config.Default
-import Yi.Search
-import Yi.Style
-import Yi.Style.Library
+import Yi.Keymap
+import Yi.Keymap.Keys
 import Yi.Misc
 import Yi.Mode.Haskell (ghciGet, ghciLoadBuffer,
                         ghciSetProcessName, ghciSetProcessArgs)
 import Yi.Mode.IReader (ireaderMode, ireadMode)
+import Yi.Search
+import Yi.Style
+import Yi.Style.Library

yi/src/library/Yi/Command.hs

@@ -25,7 +25,11 @@ import           Data.Default
 import qualified Data.Text as T
 import           Data.Typeable
 import           System.Exit (ExitCode(..))
-import           Yi.Core
+import           Yi.Buffer
+import           Yi.Core (msgEditor, startSubprocess)
+import           Yi.Dynamic
+import           Yi.Editor
+import           Yi.Keymap
 import           Yi.MiniBuffer
 import qualified Yi.Mode.Compilation as Compilation
 import qualified Yi.Mode.Interactive as Interactive

yi/src/library/Yi/Config/Default.hs

@@ -15,17 +15,22 @@ import qualified Data.Map as M
 import           Data.Monoid
 import           Paths_yi
 import           System.FilePath
+
+import           Yi.Buffer
 import           Yi.Command (cabalBuildE, cabalConfigureE, grepFind, makeBuild,
                              reloadProjectE, searchSources, shell)
 import           Yi.Config
 import           Yi.Config.Misc
-import           Yi.Core
+import           Yi.Core (errorEditor, quitEditor)
+import           Yi.Editor
 import           Yi.Eval(publishedActions)
 import           Yi.File
 import           Yi.IReader (saveAsNewArticle)
 import qualified Yi.Interact as I
+import           Yi.Keymap
 import qualified Yi.Keymap.Cua  as Cua
 import qualified Yi.Keymap.Emacs  as Emacs
+import           Yi.Keymap.Keys
 import qualified Yi.Keymap.Vim  as Vim
 import           Yi.Layout
 import qualified Yi.Mode.Abella as Abella

yi/src/library/Yi/Config/Simple.hs

@@ -101,11 +101,15 @@ module Yi.Config.Simple (
   -- we can't just export 'module Yi', because then we would get
   -- clashes with Yi.Config
   module Yi.Boot,
+  module Yi.Buffer,
   module Yi.Core,
   module Yi.Dired,
+  module Yi.Editor,
   module Yi.File,
   module Yi.Config,
   module Yi.Config.Default,
+  module Yi.Keymap,
+  module Yi.Keymap.Keys,
   module Yi.Layout,
   module Yi.Search,
   module Yi.Style,
@@ -121,13 +125,17 @@ import           Data.Maybe(mapMaybe)
 import qualified Data.Text as T
 import           Text.Printf(printf)
 import           Yi.Boot
+import           Yi.Buffer hiding (modifyMode)
 import           Yi.Config.Default
 import           Yi.Config.Misc
 import           Yi.Config.Simple.Types
-import           Yi.Core hiding(modifyMode)
+import           Yi.Core
 import           Yi.Dired
+import           Yi.Editor
 import           Yi.Eval
 import           Yi.File
+import           Yi.Keymap
+import           Yi.Keymap.Keys
 import           Yi.Layout
 import           Yi.Misc
 import           Yi.Mode.Haskell

yi/src/library/Yi/Core.hs

@@ -20,16 +20,9 @@
 -- through the interface defined here.
 
 module Yi.Core
-  ( module Yi.Dynamic
-    -- * Keymap
-  , module Yi.Keymap
-
-  , module Yi.Editor
-  , module Yi.Buffer
-  , module Yi.Keymap.Keys
-
+  (
   -- * Construction and destruction
-  , startEditor
+    startEditor
   , quitEditor          -- :: YiM ()
 
   -- * User interaction
@@ -51,9 +44,7 @@ module Yi.Core
   , runAction
   , withSyntax
   , focusAllSyntax
-
-  )
-where
+  ) where
 
 import           Control.Applicative
 import           Control.Concurrent
@@ -88,7 +79,6 @@ import           System.Process (terminateProcess, getProcessExitCode,
 import           Yi.Buffer
 import           Yi.Config
 import           Yi.Debug
-import           Yi.Dynamic
 import           Yi.Editor
 import           Yi.Keymap
 import           Yi.Keymap.Keys

yi/src/library/Yi/Dired.hs

@@ -75,8 +75,13 @@ import           System.PosixCompat.Files
 import           System.PosixCompat.Types
 import           System.PosixCompat.User
 import           Text.Printf
+import           Yi.Buffer
 import           Yi.Config
 import           Yi.Core
+import           Yi.Dynamic
+import           Yi.Editor
+import           Yi.Keymap
+import           Yi.Keymap.Keys
 import           Yi.MiniBuffer (spawnMinibufferE, withMinibufferFree, noHint,
                                 withMinibuffer)
 import           Yi.Misc (getFolder, promptFile)

yi/src/library/Yi/Eval.hs

@@ -48,11 +48,16 @@ import           Prelude hiding (error, mapM_)
 import           System.Directory (doesFileExist)
 import           Text.Read (readMaybe)
 import           Yi.Boot.Internal (reload)
+import           Yi.Buffer
 import           Yi.Config.Simple.Types
-import           Yi.Core
+import           Yi.Core (errorEditor, msgEditor, runAction)
 import           Yi.Debug
+import           Yi.Dynamic
+import           Yi.Editor
 import           Yi.File
 import           Yi.Hooks
+import           Yi.Keymap
+import           Yi.Keymap.Keys
 import qualified Yi.Paths (getEvaluatorContextFilename)
 import           Yi.Regex
 import qualified Yi.Rope as R

yi/src/library/Yi/File.hs

@@ -33,8 +33,11 @@ import qualified Data.Text as T
 import           Data.Time
 import           System.Directory
 import           System.FriendlyPath
+import           Yi.Buffer
 import           Yi.Core
 import           Yi.Dired
+import           Yi.Editor
+import           Yi.Keymap
 import           Yi.Monad
 import qualified Yi.Rope as R
 import           Yi.String

yi/src/library/Yi/Hoogle.hs

@@ -19,7 +19,9 @@ import           Data.Char (isUpper)
 import           Data.List (nub)
 import qualified Data.Text as T
 import           System.Exit (ExitCode(ExitFailure))
-import           Yi.Core
+import           Yi.Buffer
+import           Yi.Editor
+import           Yi.Keymap
 import           Yi.Process (runProgCommand)
 import qualified Yi.Rope as R
 import           Yi.String (showT)

yi/src/library/Yi/Keymap/Cua.hs

@@ -22,9 +22,13 @@ import           Control.Applicative
 import           Control.Lens hiding (act)
 import           Control.Monad
 import qualified Data.Text as T
-import           Yi.Core
+import           Yi.Buffer
+-- import           Yi.Core
+import           Yi.Editor
 import           Yi.File
+import           Yi.Keymap
 import           Yi.Keymap.Emacs.Utils
+import           Yi.Keymap.Keys
 import           Yi.MiniBuffer
 import           Yi.Misc (adjBlock, selectAll)
 import           Yi.Rectangle

yi/src/library/Yi/Keymap/Emacs.hs

@@ -33,17 +33,21 @@ import Data.Char
 import Data.Maybe
 import Data.Prototype
 import Data.Text ()
+import Yi.Buffer
 import Yi.Command (shellCommandE)
-import Yi.Core
+import Yi.Core (closeWindow, runAction, suspendEditor, userForceRefresh, withSyntax)
 import Yi.Dired
+import Yi.Editor
 import Yi.File
+import Yi.Keymap
 import Yi.Keymap.Emacs.KillRing
 import Yi.Keymap.Emacs.Utils
   (askQuitEditor, evalRegionE, executeExtendedCommandE, findFile,
    findFileNewTab, promptFile, insertNextC, isearchKeymap, killBufferE,
    queryReplaceE, readUniversalArg, scrollDownE, scrollUpE, switchBufferE,
    askSaveEditor, argToInt, promptTag, justOneSep, joinLinesE, countWordsRegion,
    findFileReadOnly)
+import Yi.Keymap.Keys
 import Yi.MiniBuffer
 import Yi.Misc (adjBlock, adjIndent, selectAll, placeMark)
 import Yi.Mode.Buffers ( listBuffers )

yi/src/library/Yi/Keymap/Emacs/Utils.hs

@@ -63,10 +63,14 @@ import qualified Data.Text as T
 import           System.Directory (doesDirectoryExist)
 import           System.FilePath (takeDirectory, takeFileName, (</>))
 import           System.FriendlyPath ()
+import           Yi.Buffer
 import           Yi.Command (cabalConfigureE, cabalBuildE, reloadProjectE)
-import           Yi.Core
+import           Yi.Core (msgEditor, quitEditor)
+import           Yi.Editor
 import           Yi.Eval
 import           Yi.File
+import           Yi.Keymap
+import           Yi.Keymap.Keys
 import           Yi.MiniBuffer
 import           Yi.Misc (promptFile)
 import           Yi.Monad

yi/src/library/Yi/Keymap/Keys.hs

@@ -23,15 +23,17 @@ module Yi.Keymap.Keys
      pString
     ) where
 
-import Yi.Event
-import Yi.Keymap
-import Data.Char
 import Prelude hiding (error)
-import Yi.Interact hiding (write)
+
 import Control.Monad (unless)
-import Yi.Debug
+import Data.Char
 import Data.List (sort, nub)
 
+import Yi.Event
+import Yi.Debug
+import Yi.Keymap
+import Yi.Interact hiding (write)
+
 printableChar :: (MonadInteract m w Event) => m Char
 printableChar = do
   Event (KASCII c) [] <- anyEvent

yi/src/library/Yi/Keymap/Vim/Tag.hs

@@ -35,8 +35,12 @@ import           Data.Typeable
 import           System.Directory (doesFileExist)
 import           System.FilePath
 import           System.FriendlyPath
-import           Yi.Core
+import           Yi.Buffer
+import           Yi.Core (errorEditor)
+import           Yi.Dynamic
+import           Yi.Editor
 import           Yi.File
+import           Yi.Keymap
 import           Yi.Tag
 import           Yi.Utils
 

yi/src/library/Yi/Main.hs

@@ -25,11 +25,14 @@ import System.Exit
 #include "ghcconfig.h"
 #endif
 
+import Yi.Buffer
 import Yi.Config
 import Yi.Config.Default
-import Yi.Core
+import Yi.Core (startEditor)
 import Yi.Debug
+import Yi.Editor
 import Yi.File
+import Yi.Keymap
 import Yi.Paths (getConfigDir)
 import Paths_yi
 

yi/src/library/Yi/MiniBuffer.hs

@@ -42,11 +42,15 @@ import           Data.String (IsString)
 import qualified Data.Text as T
 import           Data.Typeable
 import           System.CanonicalizePath (replaceShorthands)
+import           Yi.Buffer
 import           Yi.Completion (infixMatch, prefixMatch, containsMatch',
                                 completeInList, completeInList')
 import           Yi.Config
 import           Yi.Core
+import           Yi.Editor
 import           Yi.History
+import           Yi.Keymap
+import           Yi.Keymap.Keys
 import           Yi.Monad
 import qualified Yi.Rope as R
 import           Yi.Style (defaultStyle)

yi/src/library/Yi/Misc.hs

@@ -32,8 +32,10 @@ import           System.FilePath (takeDirectory, (</>), takeFileName,
                                   addTrailingPathSeparator,
                                   hasTrailingPathSeparator)
 import           System.FriendlyPath (expandTilda, isAbsolute')
+import           Yi.Buffer
 import           Yi.Completion (completeInList')
-import           Yi.Core
+import           Yi.Editor
+import           Yi.Keymap
 import           Yi.MiniBuffer (withMinibufferGen, mkCompleteFn )
 import           Yi.Monad
 import qualified Yi.Rope as R

yi/src/library/Yi/Mode/Abella.hs

@@ -15,9 +15,14 @@
 -- interactive theorem prover.
 
 module Yi.Mode.Abella
-  ( abellaModeEmacs, abella
-  , abellaEval, abellaEvalFromProofPoint, abellaUndo, abellaGet, abellaSend)
-where
+  ( abellaModeEmacs
+  , abella
+  , abellaEval
+  , abellaEvalFromProofPoint
+  , abellaUndo
+  , abellaGet
+  , abellaSend
+  ) where
 
 import           Control.Applicative
 import           Control.Lens
@@ -28,7 +33,12 @@ import           Data.Default
 import           Data.Maybe (isJust)
 import qualified Data.Text as T
 import           Data.Typeable
-import           Yi.Core
+import           Yi.Buffer
+import           Yi.Core (sendToProcess)
+import           Yi.Dynamic
+import           Yi.Editor
+import           Yi.Keymap
+import           Yi.Keymap.Keys
 import qualified Yi.Lexer.Abella as Abella
 import           Yi.MiniBuffer (CommandArguments(..))
 import qualified Yi.Mode.Interactive as Interactive

yi/src/library/Yi/Mode/Buffers.hs

@@ -18,7 +18,10 @@ import           Control.Lens
 import           Data.List.NonEmpty (toList)
 import qualified Data.Text as T
 import           System.FilePath (takeFileName)
-import           Yi.Core
+import           Yi.Buffer
+import           Yi.Editor
+import           Yi.Keymap
+import           Yi.Keymap.Keys
 import qualified Yi.Rope as R
 
 -- | Retrieve buffer list and open a them in buffer mode using the