Merge remote-tracking branch 'batkot/master' into 4416-show-package-versions

Author: batkot

CODEOWNERS

@@ -4,7 +4,6 @@
 /hls-graph @wz1000
 /hls-plugin-api @michaelpj @fendor
 /hls-test-utils @fendor
-/hie-compat @wz1000
 
 # HLS main
 /src @fendor

RELEASING.md

@@ -9,7 +9,6 @@
 - [ ] bump package versions in all `*.cabal` files (same version as hls)
   - HLS uses lockstep versioning. The core packages and all plugins use the same version number, and only support exactly this version.
     - Exceptions:
-      - `hie-compat` requires no automatic version bump.
       - `shake-bench` is an internal testing tool, not exposed to the outside world. Thus, no version bump required for releases.
   - For updating cabal files, the following script can be used:
     - ```sh

cabal.project

@@ -1,14 +1,13 @@
 packages:
          ./
-         ./hie-compat
          ./shake-bench
          ./hls-graph
          ./ghcide
          ./hls-plugin-api
          ./hls-test-utils
 
 
-index-state: 2025-06-16T09:44:13Z
+index-state: 2025-08-08T12:31:54Z
 
 tests: True
 test-show-details: direct

docs/contributing/contributing.md

@@ -197,7 +197,6 @@ pre-commit install
 #### Why are some components excluded from automatic formatting?
 
 - `test/testdata` and `test/data` are excluded because we want to test formatting plugins.
-- `hie-compat` is excluded because we want to keep its code as close to GHC as possible.
 
 ## Plugin tutorial
 

exe/Wrapper.hs

@@ -38,7 +38,8 @@ import           Control.Monad.Trans.Except         (ExceptT, runExceptT,
 import           Data.Maybe
 import qualified Data.Text                          as T
 import qualified Data.Text.IO                       as T
-import           Development.IDE.LSP.LanguageServer (runLanguageServer)
+import           Development.IDE.LSP.LanguageServer (Setup (..),
+                                                     runLanguageServer)
 import qualified Development.IDE.Main               as Main
 import           Ide.Logger                         (Doc, Pretty (pretty),
                                                      Recorder, WithPriority,
@@ -300,7 +301,12 @@ launchErrorLSP recorder errorMsg = do
               [ exitHandler exit ]
 
         let interpretHandler (env,  _st) = LSP.Iso (LSP.runLspT env . unErrorLSPM) liftIO
-        pure (doInitialize, asyncHandlers, interpretHandler)
+        pure MkSetup
+          { doInitialize
+          , staticHandlers = asyncHandlers
+          , interpretHandler
+          , onExit = [exit]
+          }
 
   runLanguageServer (cmapWithPrio pretty recorder)
     (Main.argsLspOptions defaultArguments)

ghcide-test/data/multi-unit/a-1.0.0-inplace

@@ -16,3 +16,6 @@ base
 text
 -XHaskell98
 A
++RTS
+-A32M
+-RTS

ghcide-test/data/multi-unit/c-1.0.0-inplace

@@ -17,3 +17,5 @@ a-1.0.0-inplace
 base
 -XHaskell98
 C
++RTS
+-A32M

ghcide-test/exe/CradleTests.hs

@@ -117,7 +117,11 @@ simpleSubDirectoryTest =
 
 multiTests :: FilePath -> [TestTree]
 multiTests dir =
-  [simpleMultiTest dir, simpleMultiTest2 dir, simpleMultiTest3 dir, simpleMultiDefTest dir]
+  [ simpleMultiTest dir
+  , simpleMultiTest2 dir
+  , simpleMultiTest3 dir
+  , simpleMultiDefTest dir
+  ]
 
 multiTestName :: FilePath -> String -> String
 multiTestName dir name = "simple-" ++ dir ++ "-" ++ name

ghcide-test/exe/FindDefinitionAndHoverTests.hs

@@ -187,7 +187,8 @@ tests = let
   holeL65 = Position 65 8  ;  hleInfo2 = [ExpectHoverText ["_ :: a -> Maybe a"]]
   cccL17 = Position 17 16  ;  docLink = [ExpectHoverTextRegex "\\*Defined in 'GHC.Types'\\* \\*\\(ghc-prim-[0-9.]+\\)\\*\n\n"]
   imported = Position 56 13 ; importedSig = getDocUri "Foo.hs" >>= \foo -> return [ExpectHoverText ["foo", "Foo", "Haddock"], mkL foo 5 0 5 3]
-  reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], if ghcVersion < GHC910 then mkL bar 3 5 3 8 else mkL bar 3 0 3 14]
+  reexported = Position 55 14
+  reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], if ghcVersion < GHC910 || not isWindows then mkL bar 3 5 3 8 else mkL bar 3 0 3 14]
   thLocL57 = Position 59 10 ; thLoc = [ExpectHoverText ["Identity"]]
   cmtL68 = Position 67  0  ;  lackOfdEq = [ExpectHoverExcludeText ["$dEq"]]
   import310 = Position 3 10; pkgTxt = [ExpectHoverText ["Data.Text\n\ntext-"]]
@@ -237,9 +238,9 @@ tests = let
   , testM yes            yes               imported   importedSig   "Imported symbol"
   , if isWindows then
         -- Flaky on Windows: https://github.com/haskell/haskell-language-server/issues/2997
-        testM no     yes    reexported reexportedSig "Imported symbol (reexported)"
+        testM no     yes    reexported reexportedSig "Imported symbol reexported"
     else
-        testM yes    yes    reexported reexportedSig "Imported symbol (reexported)"
+        testM yes    yes    reexported reexportedSig "Imported symbol reexported"
   , test  no     yes       thLocL57   thLoc         "TH Splice Hover"
   , test yes yes import310 pkgTxt "show package name and its version"
   ]

ghcide/ghcide.cabal

@@ -73,8 +73,7 @@ library
     , Glob
     , haddock-library              >=1.8      && <1.12
     , hashable
-    , hie-bios                     ^>=0.15.0
-    , hie-compat                   ^>=0.3.0.0
+    , hie-bios                     ^>=0.17.0
     , hiedb                        ^>= 0.7.0.0
     , hls-graph                    == 2.11.0.0
     , hls-plugin-api               == 2.11.0.0