Joseph/support 9 4 x build (#28)

josephsumabat · Jan 4, 2024 · 1a85258 · 1a85258
1 parent 66ec866
commit 1a85258
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/package.yaml b/package.yaml
@@ -27,7 +27,7 @@ dependencies:
   - errors >= 2.3.0 && < 2.4
   - extra >= 1.7.12 && < 1.8
   - filepath >= 1.4.1 && < 1.5
-  - ghc >= 9.4.4 && < 9.7
+  - ghc >= 9.4.3 && < 9.7
   - ghc-paths >= 0.1.0 && < 0.2
   - ghcide >= 2.5.0 && < 2.6.0
   - hiedb >= 0.4.2 && < 0.5

diff --git a/src/StaticLS/IDE/Workspace/Symbol.hs b/src/StaticLS/IDE/Workspace/Symbol.hs
@@ -3,7 +3,7 @@
 module StaticLS.IDE.Workspace.Symbol where
 
 import Control.Monad.IO.Class (MonadIO)
-import Control.Monad.Trans.Maybe (MaybeT (..), hoistMaybe)
+import Control.Monad.Trans.Maybe (MaybeT (..))
 import Data.Maybe (catMaybes, fromMaybe)
 import qualified Data.Text as T
 import Development.IDE.GHC.Util (printOutputable)
@@ -12,6 +12,7 @@ import GHC.Plugins hiding ((<>))
 import qualified HieDb
 import Language.LSP.Protocol.Types
 import StaticLS.HIE.File (hieFilePathToSrcFilePath)
+import StaticLS.Maybe
 import StaticLS.StaticEnv (HasStaticEnv, runHieDbMaybeT)
 
 symbolInfo :: (HasCallStack, HasStaticEnv m, MonadIO m) => T.Text -> m [SymbolInformation]
@@ -31,7 +32,7 @@ defRowToSymbolInfo (HieDb.DefRow{..} HieDb.:. _) = runMaybeT $ do
         srcFile <- hieFilePathToSrcFilePath defSrc
         let file = toUri srcFile
             loc = Location file range
-        kind <- hoistMaybe mKind
+        kind <- toAlt mKind
         pure $
             SymbolInformation
                 { _name = printOutputable defNameOcc

diff --git a/static-ls.cabal b/static-ls.cabal
@@ -69,7 +69,7 @@ library
     , errors >=2.3.0 && <2.4
     , extra >=1.7.12 && <1.8
     , filepath >=1.4.1 && <1.5
-    , ghc >=9.4.4 && <9.7
+    , ghc >=9.4.3 && <9.7
     , ghc-paths >=0.1.0 && <0.2
     , ghcide >=2.5.0 && <2.6.0
     , hiedb >=0.4.2 && <0.5
@@ -110,7 +110,7 @@ executable static-ls
     , errors >=2.3.0 && <2.4
     , extra >=1.7.12 && <1.8
     , filepath >=1.4.1 && <1.5
-    , ghc >=9.4.4 && <9.7
+    , ghc >=9.4.3 && <9.7
     , ghc-paths >=0.1.0 && <0.2
     , ghcide >=2.5.0 && <2.6.0
     , hiedb >=0.4.2 && <0.5
@@ -164,7 +164,7 @@ test-suite static-ls-test
     , errors >=2.3.0 && <2.4
     , extra >=1.7.12 && <1.8
     , filepath >=1.4.1 && <1.5
-    , ghc >=9.4.4 && <9.7
+    , ghc >=9.4.3 && <9.7
     , ghc-paths >=0.1.0 && <0.2
     , ghcide >=2.5.0 && <2.6.0
     , hiedb >=0.4.2 && <0.5