Merge branch 'master' into mpj/hashable

Author: michaelpj

.github/workflows/haskell.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.4.3', '9.2.5', '9.0.2', '8.10.7']
+        ghc: ['9.6', '9.4', '9.2', '9.0', '8.10']
         # Unlikely that we'll succeed on windows and fail on macos,
         # including it is just burning CI time. But windows could have
         # path or IO issues, so worth including

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/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