Merge pull request #466 from fendor/feature/cabal-with-repl

Load session using cabal's `--with-repl` command

Author: fendor

.github/workflows/haskell.yml

@@ -15,17 +15,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cabal: ['3.14.1.0', '3.10.2.0']
-        ghc: ['9.12.2', '9.10.1', '9.8.4', '9.6.7', '9.4.8']
+        cabal: ['head', '3.14.1.0', '3.10.2.0']
+        ghc: ['9.12.2', '9.10.1', '9.8.4', '9.6.7']
         os: [ubuntu-latest, macOS-latest, windows-latest]
+        exclude:
+          - cabal: 'head'
+            os: macOS-latest
+          - cabal: '3.10.2.0'
+            ghc: '9.12.2'
 
     steps:
     - uses: actions/checkout@v4
     - id:   extra-ghc
       uses: haskell-actions/setup@v2
       with:
         cabal-version: ${{ matrix.cabal }}
-        ghc-version: '9.2.8' # This needs to be in-sync with 'extraGhcVersion'
+        ghc-version: '9.4.8' # This needs to be in-sync with 'extraGhcVersion'
 
     - uses: haskell-actions/setup@v2
       with:
@@ -35,7 +40,7 @@ jobs:
 
     - name: Print extra ghc version
       # Needs to be in sync with 'extraGhcVersion'
-      run: ghc-9.2.8 --version
+      run: ghc-9.4.8 --version
 
     - name: Print normal ghc version
       run: ghc --version
@@ -93,3 +98,6 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
     - name: Compile Windows wrapper
       run: ghc -hide-all-packages -package base -package directory -package process -Wall -Werror wrappers/cabal.hs -o CabalWrapper
+
+    - name: Compile `--with-repl` Windows wrapper
+      run: ghc -hide-all-packages -package base -package directory -package process -Wall -Werror wrappers/cabal-with-repl.hs -o CabalWithReplWrapper

hie-bios.cabal

@@ -15,18 +15,20 @@ Build-Type:             Simple
 extra-doc-files:        ChangeLog.md
 Extra-Source-Files:     README.md
                         wrappers/cabal
+                        wrappers/cabal-with-repl
                         wrappers/cabal.hs
+                        wrappers/cabal-with-repl.hs
                         tests/configs/*.yaml
                         tests/projects/cabal-with-ghc/cabal-with-ghc.cabal
                         tests/projects/cabal-with-ghc/cabal.project
                         tests/projects/cabal-with-ghc/hie.yaml
                         tests/projects/cabal-with-ghc/src/MyLib.hs
                         tests/projects/cabal-with-ghc-and-project/cabal-with-ghc.cabal
-                        tests/projects/cabal-with-ghc-and-project/cabal.project.9.2.8
+                        tests/projects/cabal-with-ghc-and-project/cabal.project.extra
                         tests/projects/cabal-with-ghc-and-project/hie.yaml
                         tests/projects/cabal-with-ghc-and-project/src/MyLib.hs
                         tests/projects/cabal-with-project/cabal-with-project.cabal
-                        tests/projects/cabal-with-project/cabal.project.9.2.8
+                        tests/projects/cabal-with-project/cabal.project.extra
                         tests/projects/cabal-with-project/hie.yaml
                         tests/projects/cabal-with-project/src/MyLib.hs
                         tests/projects/symlink-test/a/A.hs
@@ -47,7 +49,7 @@ Extra-Source-Files:     README.md
                         tests/projects/multi-cabal-with-project/appA/src/Lib.hs
                         tests/projects/multi-cabal-with-project/appB/appB.cabal
                         tests/projects/multi-cabal-with-project/appB/src/Lib.hs
-                        tests/projects/multi-cabal-with-project/cabal.project.9.2.8
+                        tests/projects/multi-cabal-with-project/cabal.project.extra
                         tests/projects/multi-cabal-with-project/hie.yaml
                         tests/projects/monorepo-cabal/cabal.project
                         tests/projects/monorepo-cabal/hie.yaml
@@ -144,7 +146,7 @@ Extra-Source-Files:     README.md
                         tests/projects/failing-multi-repl-cabal-project/multi-repl-cabal-fail/src/Lib.hs
                         tests/projects/failing-multi-repl-cabal-project/NotInPath.hs
 
-tested-with: GHC ==9.4.8 || ==9.6.7 || ==9.8.4 || ==9.10.1 || ==9.12.2
+tested-with: GHC ==9.6.7 || ==9.8.4 || ==9.10.1 || ==9.12.2
 
 Library
   Default-Language:     Haskell2010
@@ -154,9 +156,15 @@ Library
                         HIE.Bios.Config
                         HIE.Bios.Config.YAML
                         HIE.Bios.Cradle
+                        HIE.Bios.Cradle.Cabal
+                        HIE.Bios.Cradle.ProgramVersions
+                        HIE.Bios.Cradle.ProjectConfig
+                        HIE.Bios.Cradle.Resolved
+                        HIE.Bios.Cradle.Utils
                         HIE.Bios.Environment
                         HIE.Bios.Internal.Debug
                         HIE.Bios.Flags
+                        HIE.Bios.Process
                         HIE.Bios.Types
                         HIE.Bios.Ghc.Api
                         HIE.Bios.Ghc.Check
@@ -199,14 +207,14 @@ Executable hie-bios
   Main-Is:              Main.hs
   Other-Modules:        Paths_hie_bios
   autogen-modules:      Paths_hie_bios
-  GHC-Options:          -Wall
+  GHC-Options:          -Wall +RTS -A32M -RTS
   HS-Source-Dirs:       exe
   Build-Depends:        base >= 4.16 && < 5
                       , co-log-core
                       , directory
                       , filepath
                       , hie-bios
-                      , optparse-applicative >= 0.18.1 && < 0.19
+                      , optparse-applicative >= 0.18.1 && < 0.20
                       , prettyprinter
 
 test-suite parser-tests