avoid having specialized functions for style* . display

kadoban · kadoban · commit 43ec81e99ff0 · 2017-08-23T00:39:03.000-07:00
diff --git a/src/Stack/Build/ConstructPlan.hs b/src/Stack/Build/ConstructPlan.hs
@@ -949,17 +949,17 @@ pprintExceptions exceptions stackYaml parentMap wanted =
                     Just (target:path) -> line <> "needed due to " <> encloseSep "" "" " -> " pathElems
                       where
                         pathElems =
-                            [displayTargetPkgId target] ++
+                            [styleTarget . display $ target] ++
                             map display path ++
                             [pkgIdent]
               where
-                pkgIdent = displayCurrentPkgId (packageIdentifier pkg)
+                pkgIdent = styleCurrent . display $ (packageIdentifier pkg)
     -- Skip these when they are redundant with 'NotInBuildPlan' info.
     pprintException (UnknownPackage name)
         | name `Set.member` allNotInBuildPlan = Nothing
         | name `HashSet.member` wiredInPackages =
-            Just $ "Can't build a package with same name as a wired-in-package:" <+> displayCurrentPkgName name
-        | otherwise = Just $ "Unknown package:" <+> displayCurrentPkgName name
+            Just $ "Can't build a package with same name as a wired-in-package:" <+> (styleCurrent . display $ name)
+        | otherwise = Just $ "Unknown package:" <+> (styleCurrent . display $ name)
 
     pprintFlags flags
         | Map.null flags = ""
@@ -975,7 +975,7 @@ pprintExceptions exceptions stackYaml parentMap wanted =
                    latestApplicable Nothing)
         -- TODO: For local packages, suggest editing constraints
         DependencyMismatch version -> Just $
-            displayErrorPkgId (PackageIdentifier name version) <+>
+            (styleError . display) (PackageIdentifier name version) <+>
             align ("must match" <+> goodRange <>
                    latestApplicable (Just version))
         -- I think the main useful info is these explain why missing
diff --git a/src/Stack/PrettyPrint.hs b/src/Stack/PrettyPrint.hs
@@ -19,7 +19,7 @@ module Stack.PrettyPrint
       -- encourage consistency of color meanings.
     , styleWarning, styleError, styleGood
     , styleShell, styleFile, styleDir
-    , displayTargetPkgId, displayCurrentPkgId, displayCurrentPkgName, displayErrorPkgId
+    , styleCurrent, styleTarget
     , displayMilliseconds
       -- * Formatting utils
     , bulletedList
@@ -139,17 +139,11 @@ styleFile = bold . white
 styleDir :: AnsiDoc -> AnsiDoc
 styleDir = bold . blue
 
-displayTargetPkgId :: PackageIdentifier -> AnsiDoc
-displayTargetPkgId = cyan . display
+styleCurrent :: AnsiDoc -> AnsiDoc
+styleCurrent = yellow
 
-displayCurrentPkgId :: PackageIdentifier -> AnsiDoc
-displayCurrentPkgId = yellow . display
-
-displayCurrentPkgName :: PackageName -> AnsiDoc
-displayCurrentPkgName = yellow . display
-
-displayErrorPkgId :: PackageIdentifier -> AnsiDoc
-displayErrorPkgId = styleError . display
+styleTarget :: AnsiDoc -> AnsiDoc
+styleTarget = cyan
 
 instance Display PackageName where
     display = fromString . packageNameString
