Merge pull request yi-editor#1134 from 0rphee/master

fix removed reexported imports from mtl and change stackage lts to 21.12

stack.yaml

@@ -18,11 +18,14 @@ packages:
 - yi-language
 - yi-snippet
 - yi
-resolver: lts-11.12
+resolver: lts-21.12
 build:
  library-profiling: false
  executable-profiling: false
 
+extra-deps:
+  - Hclip-3.0.0.4
+
 # needed for macOS
 # flags:
 #   gtk:

stack.yaml.lock

@@ -0,0 +1,19 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+    hackage: Hclip-3.0.0.4@sha256:df341c936594465df25c3b9f93f6ebe3110a36d64a51dbbd1dbd557394bbdba4,1648
+    pantry-tree:
+      sha256: bc09b0acdf0ffce64e16a53ffc18d76dc05d4282433cae723402d1b8ecc01301
+      size: 205
+  original:
+    hackage: Hclip-3.0.0.4
+snapshots:
+- completed:
+    sha256: 9313df78f49519315342f4c51ffc5da12659d3735f8ac3c54a1fb98ff874474e
+    size: 640036
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/12.yaml
+  original: lts-21.12

yi-core/src/Yi/Dired.hs

@@ -49,7 +49,8 @@ import           Control.Applicative      ((<|>))
 import           Control.Category         ((>>>))
 import           Control.Exc              (orException, printingException)
 import           Lens.Micro.Platform      (makeLenses, use, (%~), (&), (.=), (.~), (^.))
-import           Control.Monad.Reader     (asks, foldM, unless, void, when)
+import           Control.Monad            (foldM, unless, void, when)
+import           Control.Monad.Reader     (asks)
 import qualified Data.Attoparsec.Text     as P
 import           Data.Binary              (Binary)
 import           Data.Char                (toLower)
@@ -90,11 +91,10 @@ import           System.PosixCompat.Files (FileStatus, fileExist, fileGroup,
                                            unionFileModes)
 import           System.PosixCompat.Types (FileMode, GroupID, UserID)
 #ifndef mingw32_HOST_OS
-import           System.Posix.User        (GroupEntry, GroupEntry (..),
-                                           UserEntry (..), getAllGroupEntries,
+import           System.Posix.User        (GroupEntry(..), UserEntry(..),getAllGroupEntries,
                                            getAllUserEntries,
                                            getGroupEntryForID,
-                                           getUserEntryForID, groupID, userID)
+                                           getUserEntryForID, groupID, userID, userName, groupName)
 #endif
 import           Text.Printf              (printf)
 import           Yi.Buffer

yi-core/src/Yi/Editor.hs

@@ -104,9 +104,8 @@ import           Prelude                        hiding (all, concatMap, foldl, f
 import           Lens.Micro.Platform            (Lens', lens, mapped,
                                                  use, view, (%=), (%~),
                                                  (&), (.~), (^.))
-import           Control.Monad                  (forM_, liftM)
-import           Control.Monad.Reader           (MonadReader (ask), asks,
-                                                 unless, when)
+import           Control.Monad                  (forM_, liftM, unless, when)
+import           Control.Monad.Reader           (MonadReader (ask), asks)
 import           Control.Monad.State            (gets, modify)
 import           Data.Binary                    (Binary, get, put)
 import           Data.Default                   (Default, def)

yi-core/src/Yi/Interact.hs

@@ -72,7 +72,8 @@ import           Control.Applicative (Alternative ((<|>), empty))
 import           Control.Arrow       (first)
 import           Lens.Micro.Platform          (_1, _2, view)
 import qualified Control.Monad.Fail as Fail
-import           Control.Monad.State (MonadPlus (..), MonadTrans (lift), StateT)
+import           Control.Monad.State (MonadTrans (lift), StateT)
+import           Control.Monad       (MonadPlus(..))
 import           Data.Function       (on)
 import           Data.List           (groupBy)
 import qualified Data.Text           as T (Text, append, pack)

yi-core/src/Yi/Monad.hs

@@ -9,9 +9,10 @@ module Yi.Monad (
                  with,
                 ) where
 
+import Control.Monad (when)
 import Control.Monad.Base   (MonadBase, liftBase)
 import Control.Monad.Reader (MonadReader, ask)
-import Control.Monad.State  (MonadState, get, gets, put, when)
+import Control.Monad.State  (MonadState, get, gets, put)
 import Lens.Micro.Platform (Getting, ASetter, (.=), use)
 
 -- | Combination of the Control.Monad.State 'modify' and 'gets'