Add --with-repl flag to modify program the "repl" starts with

Programs like doctest and hie-bios want to use `cabal-install` in order
to discover the correct options to start a GHC session.  Previously they
used the `--with-compiler` option, but this led to complications since
the wrapper was called for compiling all dependencies and so on, the
shim had to be more complicated and forward arguments onto the user's
version of GHC.

The `--with-repl` command allows you to pass a program which is used
instead of GHC at the final invocation of the repl. Therefore the
wrappers don't have to deal with being a complete shim but can
concentrate on intercepting the arguments at the end.

This commit removes the special hack to not use response files with
--interactive mode. Tools are expected to deal with them appropiately,
which is much easier now only one invocation is passed to the wrapper.

Fixes #9115

Author: mpickering

Cabal/src/Distribution/Simple/GHC/Build/Link.hs

@@ -751,10 +751,10 @@ runReplOrWriteFlags ghcProg lbi rflags ghcOpts pkg_name target =
       verbosity = fromFlag $ setupVerbosity common
       tempFileOptions = commonSetupTempFileOptions common
    in case replOptionsFlagOutput (replReplOptions rflags) of
-        NoFlag ->
-          runGHCWithResponseFile
-            "ghc.rsp"
-            Nothing
+        NoFlag -> do
+          -- If a specific GHC implementation is specified, use it
+          runReplProgram
+            (flagToMaybe $ replWithRepl (replReplOptions rflags))
             tempFileOptions
             verbosity
             ghcProg

Cabal/src/Distribution/Simple/Program/GHC.hs

@@ -16,6 +16,7 @@ module Distribution.Simple.Program.GHC
   , renderGhcOptions
   , runGHC
   , runGHCWithResponseFile
+  , runReplProgram
   , packageDbArgsDb
   , normaliseGhcArgs
   ) where
@@ -668,37 +669,7 @@ runGHCWithResponseFile fileNameTemplate encoding tempFileOptions verbosity ghcPr
 
       args = progInvokeArgs invocation
 
-      -- Don't use response files if the first argument is `--interactive`, for
-      -- two related reasons.
-      --
-      -- `hie-bios` relies on a hack to intercept the command-line that `Cabal`
-      -- supplies to `ghc`.  Specifically, `hie-bios` creates a script around
-      -- `ghc` that detects if the first option is `--interactive` and if so then
-      -- instead of running `ghc` it prints the command-line that `ghc` was given
-      -- instead of running the command:
-      --
-      -- https://github.com/haskell/hie-bios/blob/ce863dba7b57ded20160b4f11a487e4ff8372c08/wrappers/cabal#L7
-      --
-      -- … so we can't store that flag in the response file, otherwise that will
-      -- break.  However, even if we were to add a special-case to keep that flag
-      -- out of the response file things would still break because `hie-bios`
-      -- stores the arguments to `ghc` that the wrapper script outputs and reuses
-      -- them later.  That breaks if you use a response file because it will
-      -- store an argument like `@…/ghc36000-0.rsp` which is a temporary path
-      -- that no longer exists after the wrapper script completes.
-      --
-      -- The work-around here is that we don't use a response file at all if the
-      -- first argument (and only the first argument) to `ghc` is
-      -- `--interactive`.  This ensures that `hie-bios` and all downstream
-      -- utilities (e.g. `haskell-language-server`) continue working.
-      --
-      --
-      useResponseFile =
-        case args of
-          "--interactive" : _ -> False
-          _ -> compilerSupportsResponseFiles
-
-  if not useResponseFile
+  if not compilerSupportsResponseFiles
     then runProgramInvocation verbosity invocation
     else do
       let (rtsArgs, otherArgs) = splitRTSArgs args
@@ -721,6 +692,24 @@ runGHCWithResponseFile fileNameTemplate encoding tempFileOptions verbosity ghcPr
 
           runProgramInvocation verbosity newInvocation
 
+-- Either run GHC to start the repl or the argument to --with-repl flag.
+runReplProgram
+  :: Maybe FilePath
+  -- ^ --with-repl argument
+  -> TempFileOptions
+  -> Verbosity
+  -> ConfiguredProgram
+  -> Compiler
+  -> Platform
+  -> Maybe (SymbolicPath CWD (Dir Pkg))
+  -> GhcOptions
+  -> IO ()
+runReplProgram withReplProg tempFileOptions verbosity ghcProg comp platform mbWorkDir ghcOpts =
+  let replProg = case withReplProg of
+        Just path -> ghcProg{programLocation = FoundOnSystem path}
+        Nothing -> ghcProg
+   in runGHCWithResponseFile "ghci.rsp" Nothing tempFileOptions verbosity replProg comp platform mbWorkDir ghcOpts
+
 ghcInvocation
   :: Verbosity
   -> ConfiguredProgram

Cabal/src/Distribution/Simple/Setup/Repl.hs

@@ -54,6 +54,7 @@ data ReplOptions = ReplOptions
   { replOptionsFlags :: [String]
   , replOptionsNoLoad :: Flag Bool
   , replOptionsFlagOutput :: Flag FilePath
+  , replWithRepl :: Flag FilePath
   }
   deriving (Show, Generic)
 
@@ -85,7 +86,7 @@ instance Binary ReplOptions
 instance Structured ReplOptions
 
 instance Monoid ReplOptions where
-  mempty = ReplOptions mempty (Flag False) NoFlag
+  mempty = ReplOptions mempty (Flag False) NoFlag NoFlag
   mappend = (<>)
 
 instance Semigroup ReplOptions where
@@ -229,4 +230,11 @@ replOptions _ =
       replOptionsFlagOutput
       (\p flags -> flags{replOptionsFlagOutput = p})
       (reqArg "DIR" (succeedReadE Flag) flagToList)
+  , option
+      []
+      ["with-repl"]
+      "give the path to a particular GHC implementation to use for REPL"
+      replWithRepl
+      (\v flags -> flags{replWithRepl = v})
+      (reqArgFlag "PATH")
   ]

cabal-install/src/Distribution/Client/CmdRepl.hs

@@ -180,12 +180,10 @@ import Distribution.Client.ReplFlags
   , topReplOptions
   )
 import Distribution.Compat.Binary (decode)
-import Distribution.Simple.Flag (fromFlagOrDefault, pattern Flag)
+import Distribution.Simple.Flag (flagToMaybe, fromFlagOrDefault, pattern Flag)
 import Distribution.Simple.Program.Builtin (ghcProgram)
 import Distribution.Simple.Program.Db (requireProgram)
 import Distribution.Simple.Program.Types
-  ( ConfiguredProgram (programOverrideEnv)
-  )
 import System.Directory
   ( doesFileExist
   , getCurrentDirectory
@@ -481,7 +479,7 @@ replAction flags@NixStyleFlags{extraFlags = r@ReplFlags{..}, ..} targetStrings g
                 }
 
         -- run ghc --interactive with
-        runGHCWithResponseFile "ghci_multi.rsp" Nothing tempFileOptions verbosity ghcProg' compiler platform Nothing ghc_opts
+        runReplProgram (flagToMaybe $ replWithRepl replOpts') tempFileOptions verbosity ghcProg' compiler platform Nothing ghc_opts
       else do
         -- single target repl
         replOpts'' <- case targetCtx of

cabal-testsuite/PackageTests/WithRepl/ModuleA.hs

@@ -0,0 +1,4 @@
+module ModuleA where
+
+x :: Int
+x = 42

cabal-testsuite/PackageTests/WithRepl/cabal-with-repl.cabal

@@ -0,0 +1,9 @@
+cabal-version:      2.4
+name:               cabal-with-repl
+version:            0.1.0.0
+build-type:         Simple
+
+library
+  exposed-modules:  ModuleA
+  build-depends:    base
+  default-language: Haskell2010

cabal-testsuite/PackageTests/WithRepl/cabal.project

@@ -0,0 +1 @@
+packages: .

cabal-testsuite/PackageTests/WithRepl/cabal.test.hs

@@ -0,0 +1,19 @@
+import Test.Cabal.Prelude
+import System.Directory (getCurrentDirectory)
+import System.FilePath ((</>))
+
+main = do
+  -- Test that --with-repl works with a valid GHC path
+  cabalTest' "with-repl-valid-path" $ do
+    cabal' "clean" []
+    -- Get the path to the system GHC
+    ghc_prog <- requireProgramM ghcProgram
+    res <- cabalWithStdin "v2-repl" ["--with-repl=" ++ programPath ghc_prog] ""
+    assertOutputContains "Ok, one module loaded." res
+    assertOutputContains "GHCi, version" res
+
+  -- Test that --with-repl fails with an invalid path
+  cabalTest' "with-repl-invalid-path" $ do
+    cabal' "clean" []
+    res <- fails $ cabalWithStdin "v2-repl" ["--with-repl=/nonexistent/path/to/ghc"] ""
+    assertOutputContains "does not exist" res

cabal-testsuite/PackageTests/WithRepl/cabal.with-repl-invalid-path.out

@@ -0,0 +1,12 @@
+# cabal clean
+# cabal v2-repl
+Configuration is affected by the following files:
+- cabal.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - cabal-with-repl-0.1.0.0 (interactive) (lib) (first run)
+Configuring library for cabal-with-repl-0.1.0.0...
+Preprocessing library for cabal-with-repl-0.1.0.0...
+Error: [Cabal-7125]
+repl failed for cabal-with-repl-0.1.0.0-inplace.

cabal-testsuite/PackageTests/WithRepl/cabal.with-repl-valid-path.out

@@ -0,0 +1,10 @@
+# cabal clean
+# cabal v2-repl
+Configuration is affected by the following files:
+- cabal.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - cabal-with-repl-0.1.0.0 (interactive) (lib) (first run)
+Configuring library for cabal-with-repl-0.1.0.0...
+Preprocessing library for cabal-with-repl-0.1.0.0...

cabal-testsuite/PackageTests/WithReplExe/Main.hs

@@ -0,0 +1,4 @@
+import ModuleA
+
+main :: IO ()
+main = print $ "My specific executable"

cabal-testsuite/PackageTests/WithReplExe/Main2.hs

@@ -0,0 +1,3 @@
+module Main where
+
+main = print "My other executable"

cabal-testsuite/PackageTests/WithReplExe/ModuleA.hs

@@ -0,0 +1,4 @@
+module ModuleA where
+
+add :: Num a => a -> a -> a
+add x y = x + y

cabal-testsuite/PackageTests/WithReplExe/cabal-with-repl-exe.cabal

@@ -0,0 +1,14 @@
+cabal-version:      2.4
+name:               cabal-with-repl-exe
+version:            0.1.0.0
+build-type:         Simple
+
+executable test-exe
+  main-is:          Main.hs
+  build-depends:    base
+  default-language: Haskell2010
+
+executable test-exe2
+  main-is:          Main2.hs
+  build-depends:    base
+  default-language: Haskell2010

cabal-testsuite/PackageTests/WithReplExe/cabal.out

@@ -0,0 +1,22 @@
+# cabal v2-build
+Configuration is affected by the following files:
+- cabal.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - cabal-with-repl-exe-0.1.0.0 (exe:test-exe) (first run)
+Configuring executable 'test-exe' for cabal-with-repl-exe-0.1.0.0...
+Preprocessing executable 'test-exe' for cabal-with-repl-exe-0.1.0.0...
+Building executable 'test-exe' for cabal-with-repl-exe-0.1.0.0...
+# cabal v2-repl
+Configuration is affected by the following files:
+- cabal.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - cabal-with-repl-exe-0.1.0.0 (interactive) (exe:test-exe) (configuration changed)
+ - cabal-with-repl-exe-0.1.0.0 (interactive) (exe:test-exe2) (first run)
+Configuring executable 'test-exe' for cabal-with-repl-exe-0.1.0.0...
+Preprocessing executable 'test-exe' for cabal-with-repl-exe-0.1.0.0...
+Configuring executable 'test-exe2' for cabal-with-repl-exe-0.1.0.0...
+Preprocessing executable 'test-exe2' for cabal-with-repl-exe-0.1.0.0...

cabal-testsuite/PackageTests/WithReplExe/cabal.project

@@ -0,0 +1 @@
+packages: .

cabal-testsuite/PackageTests/WithReplExe/cabal.test.hs

@@ -0,0 +1,27 @@
+{-# LANGUAGE OverloadedStrings #-}
+import Distribution.Simple.Program
+import Distribution.Simple.Program.GHC
+import Distribution.Simple.Utils
+import Test.Cabal.Prelude
+
+main = do
+  mkTest $ \exePath -> do
+    -- Try using the executable with --with-repl
+    res <- cabalWithStdin "v2-repl" ["--with-repl=" ++ exePath, "test-exe"] ""
+    assertOutputContains "My specific executable" res
+  mkTest $ \exePath -> do
+    requireGhcSupportsMultiRepl
+    res <- cabalWithStdin "v2-repl" ["--enable-multi-repl", "--with-repl=" ++ exePath, "all"] ""
+    assertOutputContains "My specific executable" res
+
+
+mkTest act = cabalTest $ do
+  -- Build the executable
+  cabal' "v2-build" ["test-exe"]
+  -- Get the path to the built executable
+  withPlan $ do
+    exePath <- planExePath "cabal-with-repl-exe" "test-exe"
+    act exePath
+
+
+

cabal-testsuite/src/Test/Cabal/Prelude.hs

@@ -1055,6 +1055,10 @@ skipUnlessJavaScript = skipUnlessIO "needs the JavaScript backend" isJavaScript
 skipIfJavaScript :: IO ()
 skipIfJavaScript = skipIfIO "incompatible with the JavaScript backend" isJavaScript
 
+requireGhcSupportsMultiRepl :: TestM ()
+requireGhcSupportsMultiRepl =
+  skipUnlessGhcVersion ">= 9.4"
+
 isWindows :: Bool
 isWindows = buildOS == Windows