Remove target string manipulation

Author: philderbeast

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

@@ -155,7 +155,6 @@ import Distribution.Utils.Generic
 import Distribution.Verbosity
   ( lessVerbose
   , normal
-  , silent
   )
 import Language.Haskell.Extension
   ( Language (..)
@@ -287,22 +286,7 @@ multiReplDecision ctx compiler flags =
 -- For more details on how this works, see the module
 -- "Distribution.Client.ProjectOrchestration"
 replAction :: NixStyleFlags ReplFlags -> [String] -> GlobalFlags -> IO ()
-replAction flags@NixStyleFlags{extraFlags = replFlags@ReplFlags{..}, configFlags} targetStrings' globalFlags = do
-  -- NOTE: The REPL will work with no targets in the context of a project if a
-  -- single package is in the same directory as the project file. To have the
-  -- same behaviour when the package is somewhere else we adjust the targets.
-  targetStrings <-
-    if null targetStrings'
-      then withCtx silent targetStrings' $ \targetCtx ctx _ ->
-        return . fromMaybe [] $ case targetCtx of
-          ProjectContext ->
-            let pkgs = projectPackages $ projectConfig ctx
-             in if length pkgs == 1
-                  then pure <$> listToMaybe pkgs
-                  else Nothing
-          _ -> Nothing
-      else return targetStrings'
-
+replAction flags@NixStyleFlags{extraFlags = replFlags@ReplFlags{..}, configFlags} targetStrings globalFlags = do
   withCtx verbosity targetStrings $ \targetCtx ctx targetSelectors -> do
     when (buildSettingOnlyDeps (buildSettings ctx)) $
       dieWithException verbosity ReplCommandDoesn'tSupport
@@ -312,7 +296,7 @@ replAction flags@NixStyleFlags{extraFlags = replFlags@ReplFlags{..}, configFlags
     baseCtx <- case targetCtx of
       ProjectContext -> do
         let pkgs = projectPackages $ projectConfig ctx
-        when (null targetStrings && length pkgs /= 1) $
+        when (null targetSelectors && not (null pkgs)) $
           let projectName = case projectConfigProjectFile . projectConfigShared $ projectConfig ctx of
                 Flag "" -> Nothing
                 Flag n -> Just $ quotes (text n)

cabal-testsuite/PackageTests/ReplProjectTarget/cabal.out

@@ -30,21 +30,13 @@ Please pick a single [package:][ctype:]component as target for the REPL command.
 Configuration is affected by the following files:
 - empty.project
 Warning: There are no packages or optional-packages in the project
-Error: [Cabal-7076]
-There are no packages in 'empty.project'. Please add a package to the project and pick a single [package:][ctype:]component as target for the REPL command.
+Resolving dependencies...
 # checking repl command with a missing 'missing.project'
 # cabal repl
 # checking repl command with a single package in 'one.project'
 # cabal repl
 Configuration is affected by the following files:
 - one.project
-Resolving dependencies...
-Build profile: -w ghc-<GHCVER> -O1
-In order, the following will be built:
- - pkg-one-0.1 (interactive) (first run)
-Configuring pkg-one-0.1...
-Preprocessing library for pkg-one-0.1...
-Error: [Cabal-7554]
-can't find source for Foo in ., <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/pkg-one-0.1/build/autogen, <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/pkg-one-0.1/build/global-autogen
-Error: [Cabal-7125]
-repl failed for pkg-one-0.1-inplace.
+Error: [Cabal-7076]
+Please pick a single [package:][ctype:]component as target for the REPL command. The packages in 'one.project' from which to select a component target are:
+ - pkg-one

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

@@ -33,8 +33,10 @@ main = cabalTest . recordMode RecordMarked $ do
   assertOutputContains "The given project file 'missing.project' does not exist." missing
 
   log "checking repl command with a single package in 'one.project'"
-  one <- fails $ cabal' "repl" [ "--project-file=one.project" ]
-  assertOutputContains "In order, the following will be built" one
-  assertOutputContains "pkg-one-0.1 (interactive) (first run)" one
+  oneProject <- fails $ cabal' "repl" [ "--project-file=one.project" ]
+  assertOutputContains "Configuration is affected by the following files:" oneProject
+  assertOutputContains "- one.project" oneProject
+  assertOutputContains "The packages in 'one.project' from which to select a component target are:" oneProject
+  assertOutputContains "- pkg-one" oneProject
 
   return ()