Merge pull request #3983 from ncaq/fix-no-newline-terminating-file

borsboom · web-flow · commit 7e6e6a4d0601 · 2018-04-24T06:04:05.000-07:00
fixed: terminating is newline
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -13,6 +13,7 @@ Other enhancements:
 
 Bug fixes:
 
+* `~/.stack/config.yaml` and `stack.yaml` terminating by newline
 
 ## v1.7.0.3 (release candidate)
 
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -964,4 +964,5 @@ defaultConfigYaml = S.intercalate "\n"
      , "#    author-email:"
      , "#    copyright:"
      , "#    github-username:"
+     , ""
      ]
diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs
@@ -185,6 +185,7 @@ renderStackYaml p ignoredPackages dupPackages =
         <> F.foldMap (goComment o) comments
         <> goOthers (o `HM.difference` HM.fromList comments)
         <> B.byteString footerHelp
+        <> "\n"
 
     goComment o (name, comment) =
         case (convert <$> HM.lookup name o) <|> nonPresentValue name of

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ Other enhancements:`
`13`	`13`
`14`	`14`	`Bug fixes:`
`15`	`15`
	`16`	+* `~/.stack/config.yaml` and `stack.yaml` terminating by newline
`16`	`17`
`17`	`18`	`## v1.7.0.3 (release candidate)`
`18`	`19`
Original file line number	Diff line number	Diff line change
`@@ -964,4 +964,5 @@ defaultConfigYaml = S.intercalate "\n"`
`964`	`964`	`, "# author-email:"`
`965`	`965`	`, "# copyright:"`
`966`	`966`	`, "# github-username:"`
	`967`	`+ , ""`
`967`	`968`	`]`