Fix #622 Handle multi-line value for field description

Author: mpilgrem

CHANGELOG.md

@@ -1,6 +1,9 @@
-## Changes in 0.38.3
+## Changes in 0.38.4
   - Accept a list for `category` (see #624)
 
+## Changes in 0.38.3
+  - Handle a multi-line value for the `description` key of a flag (see #623)
+
 ## Changes in 0.38.2
   - Infer `cabal-version: 3.12` when `PackageInfo_*` is used (see #620)
 

hpack.cabal

@@ -1,6 +1,6 @@
 spec-version: 0.36.0
 name: hpack
-version: 0.38.3
+version: 0.38.4
 synopsis: A modern format for Haskell packages
 description: See README at <https://github.com/sol/hpack#readme>
 author: Simon Hengel <[email protected]>

package.yaml

@@ -104,7 +104,7 @@ renderPackageWith settings headerFieldsAlignment existingFieldOrder sectionsFiel
       return $ concat [
           sourceRepository
         , customSetup
-        , map renderFlag packageFlags
+        , map (renderFlag packageCabalVersion) packageFlags
         , library
         , internalLibraries
         , executables
@@ -151,13 +151,16 @@ sortStanzaFields sectionsFieldOrder = go
       Stanza name fields : xs | Just fieldOrder <- lookup name sectionsFieldOrder -> Stanza name (sortFieldsBy fieldOrder fields) : go xs
       x : xs -> x : go xs
 
+descriptionFieldSize :: Int
+descriptionFieldSize = length ("description: " :: String)
+
 formatDescription :: CabalVersion -> Alignment -> String -> String
 formatDescription cabalVersion (Alignment alignment) description = case map emptyLineToDot $ lines description of
   x : xs -> intercalate "\n" (x : indent xs)
   [] -> ""
   where
     n :: Int
-    n = max alignment (length ("description: " :: String))
+    n = max alignment descriptionFieldSize
 
     indentation :: String
     indentation = replicate n ' '
@@ -185,13 +188,17 @@ renderSourceRepository SourceRepository{..} = Stanza "source-repository head" [
   , Field "subdir" (maybe "" Literal sourceRepositorySubdir)
   ]
 
-renderFlag :: Flag -> Element
-renderFlag Flag {..} = Stanza ("flag " ++ flagName) $ description ++ [
+renderFlag :: CabalVersion -> Flag -> Element
+renderFlag cabalVersion Flag {..} = Stanza ("flag " ++ flagName) $ description ++ [
     Field "manual" (Literal $ show flagManual)
   , Field "default" (Literal $ show flagDefault)
   ]
   where
-    description = maybe [] (return . Field "description" . Literal) flagDescription
+    description = maybe [] (return . Field "description" . Literal) formattedFlagDescription
+    -- We have to 'hard code' that the flag stanza's description field is
+    -- indented by two spaces:
+    alignment = Alignment (descriptionFieldSize + 2)
+    formattedFlagDescription = formatDescription cabalVersion alignment <$> flagDescription
 
 renderInternalLibraries :: Map String (Section Library) -> RenderM [Element]
 renderInternalLibraries = traverse renderInternalLibrary . Map.toList

src/Hpack/Render.hs

@@ -274,7 +274,7 @@ spec = do
   describe "renderFlag" $ do
     it "renders flags" $ do
       let flag = (Flag "foo" (Just "some flag") True False)
-      render defaultRenderSettings 0 (renderFlag flag) `shouldBe` [
+      render defaultRenderSettings 0 (renderFlag cabalVersion flag) `shouldBe` [
           "flag foo"
         , "  description: some flag"
         , "  manual: True"