Merge pull request commercialhaskell#6503 from commercialhaskell/re6492

Re commercialhaskell#6492 Prefer 'project packages' to 'local packages'

Author: mpilgrem

src/Stack/Build/Haddock.hs

@@ -135,7 +135,7 @@ generateLocalHaddockIndex bco localDumpPkgs locals = do
           )
           locals
   generateHaddockIndex
-    "local packages"
+    "project packages"
     bco
     dumpPackages
     "."
@@ -160,7 +160,7 @@ generateDepsHaddockIndex bco globalDumpPkgs snapshotDumpPkgs localDumpPkgs local
              ) locals
       depDocDir = localDepsDocDir bco
   generateHaddockIndex
-    "local packages and dependencies"
+    "project packages and dependencies"
     bco
     deps
     ".."

src/Stack/Build/Target.hs

@@ -394,10 +394,10 @@ resolveRawTarget sma allLocs (rawInput, rt) =
     | Map.member name locals = pure $ Left $
         fillSep
           [ style Target (fromPackageName name)
-          , flow "target has a specific version number, but it is a local \
+          , flow "target has a specific version number, but it is a project \
                  \package. To avoid confusion, we will not install the \
-                 \specified version or build the local one. To build the \
-                 \local package, specify the target without an explicit \
+                 \specified version or build the project package. To build the \
+                 \project package, specify the target without an explicit \
                  \version."
           ]
     | otherwise =
@@ -572,8 +572,8 @@ parseTargets needTargets haddockDeps boptscli smActual = do
             ]
       | null textTargets' && Map.null locals ->
           prettyThrowIO $ TargetParseException
-            [ flow "The project contains no local packages (packages not \
-                   \marked with 'extra-dep')."
+            [ flow "The project contains no project packages (packages other \
+                   \than extra-deps)."
             ]
       | otherwise -> prettyThrowIO $ TargetParseException
           [ flow "The specified targets matched no packages." ]

src/Stack/BuildPlan.hs

@@ -123,7 +123,7 @@ instance Exception BuildPlanException where
     shadowed'
       | Map.null shadowed = []
       | otherwise = concat
-          [ ["The following packages are shadowed by local packages:"]
+          [ ["The following packages are shadowed by project packages:"]
           , map go (Map.toList shadowed)
           , ["Recommended action: modify the extra-deps field of " ++
              toFilePath stackYaml ++

src/Stack/ConfigCmd.hs

@@ -378,7 +378,7 @@ urlArgument = OA.strArgument
 
 configCmdEnvParser :: OA.Parser EnvSettings
 configCmdEnvParser = EnvSettings
-  <$> boolFlags True "locals" "include local package information" mempty
+  <$> boolFlags True "locals" "include information about local packages" mempty
   <*> boolFlags True
         "ghc-package-path" "set GHC_PACKAGE_PATH environment variable" mempty
   <*> boolFlags True "stack-exe" "set STACK_EXE environment variable" mempty

src/Stack/Coverage.hs

@@ -94,7 +94,7 @@ instance Pretty CoveragePrettyException where
     "[S-9975]"
     <> line
     <> fillSep
-         [ flow "Expected a local package, but"
+         [ flow "Expected a project package, but"
          , style Target . fromPackageName $ name
          , flow "is either an extra-dep or in the snapshot."
          ]

src/Stack/Init.hs

@@ -410,7 +410,7 @@ renderStackYaml p ignoredPackages dupPackages =
     , ("snapshot"         , snapshotHelp)
     , ("packages"         , packageHelp)
     , ("extra-deps"       , extraDepsHelp)
-    , ("flags"            , "# Override default flag values for local packages and extra-deps")
+    , ("flags"            , "# Override default flag values for project packages and extra-deps")
     , ("extra-package-dbs", "# Extra package databases containing global packages")
     ]
   -- Help strings

src/Stack/Options/BuildParser.hs

@@ -121,7 +121,7 @@ targetsParser =
   many (textArgument
     (  metavar "TARGET"
     <> completer targetCompleter
-    <> help "If none specified, use all local packages. See \
+    <> help "If none specified, use all project packages. See \
             \https://docs.haskellstack.org/en/stable/build_command/#target-syntax \
             \for details."
     ))
@@ -132,7 +132,7 @@ flagsParser = Map.unionsWith Map.union
        (  long "flag"
        <> completer flagCompleter
        <> metavar "PACKAGE:[-]FLAG"
-       <> help "Override flags set in stack.yaml (applies to local packages \
+       <> help "Override flags set in stack.yaml (applies to project packages \
                \and extra-deps)."
        ))
 

src/Stack/Options/ConfigParser.hs

@@ -181,7 +181,7 @@ configOptsParser currentDir hide0 =
         hide
   <*> fmap toDumpLogs (firstBoolFlagsNoDefault
         "dump-logs"
-        "dump the build output logs for local packages to the console. \
+        "dump the build output logs for project packages to the console. \
         \(default: dump warning logs)"
         hide)
   <*> optionalFirst (option readColorWhen

src/Stack/Options/GhciParser.hs

@@ -27,7 +27,7 @@ ghciOptsParser = GhciOpts
   <$> many (textArgument
         (  metavar "TARGET/FILE"
         <> completer (targetCompleter <> fileExtCompleter [".hs", ".lhs"])
-        <> help "If none specified, use all local packages. See \
+        <> help "If none specified, use all project packages. See \
                 \https://docs.haskellstack.org/en/stable/build_command/#target-syntax \
                 \for details. If a path to a .hs or .lhs file is specified, it \
                 \will be loaded."

src/Stack/Options/LsParser.hs

@@ -144,7 +144,7 @@ textFilterParser = many (OA.option parseListDepsTextFilter
   (  OA.long "filter"
   <> OA.metavar "ITEM"
   <> OA.help "Item to be filtered out of the results, if present, being either \
-             \$locals (for all local packages) or a package name (can be \
+             \$locals (for all project packages) or a package name (can be \
              \specified multiple times)."
   ))
 

src/Stack/Types/Build/Exception.hs

@@ -149,7 +149,7 @@ instance Exception BuildException where
      -- Suppressing duplicate output
   displayException (LocalPackageDoesn'tMatchTarget name localV requestedV) = concat
     [ "Error: [S-5797]\n"
-    , "Version for local package "
+    , "Version for project package "
     , packageNameString name
     , " is "
     , versionString localV

src/Stack/Types/Config/Exception.hs

@@ -218,8 +218,8 @@ instance Pretty ConfigPrettyException where
     "[S-5470]"
     <> line
     <> fillSep
-         [ flow "The same package name is used in more than one local package \
-                \or"
+         [ flow "The same package name is used in more than one project \
+                \package or"
          , style Shell "extra-deps" <> "."
          ]
     <> mconcat (map go pairs)