Merge pull request #485 from joyfulmantis/ospath-fix

More 9.6 Import fixes

Author: michaelpj

lsp-test/src/Language/LSP/Test/Session.hs

@@ -43,6 +43,8 @@ import Control.Lens hiding (List, Empty)
 import Control.Monad
 import Control.Monad.Catch (MonadThrow)
 import Control.Monad.Except
+import Control.Monad.IO.Class
+import Control.Monad.Trans.Class
 #if __GLASGOW_HASKELL__ == 806
 import Control.Monad.Fail
 #endif

lsp-types/lsp-types.cabal

@@ -74,6 +74,7 @@ library
     , deepseq
     , Diff              >=0.2
     , dlist
+    , exceptions
     , hashable
     , lens              >=4.15.2
     , mod

lsp-types/src/Language/LSP/Protocol/Types/Uri/OsPath.hs

@@ -19,7 +19,7 @@ module Language.LSP.Protocol.Types.Uri.OsPath
 import           Control.Exception      hiding (try)
 import           Control.Monad.Catch
 import           GHC.IO.Encoding        (getFileSystemEncoding)
-import           Language.LSP.Types.Uri
+import           Language.LSP.Protocol.Types.Uri
 import           System.IO
 import           System.IO.Unsafe       (unsafePerformIO)
 import           System.OsPath

lsp-types/test/URIFilePathSpec.hs

@@ -18,7 +18,9 @@ import qualified System.OsPath           as OsPath
 #endif
 
 import           Control.Monad           (when)
+import           Control.Exception       (throwIO)
 import           Data.List
+import           Data.Maybe              (fromJust)
 import           Data.Text               (Text, pack)
 import           Language.LSP.Protocol.Types