Fix newline after heredocs

Author: reteps

README.md

@@ -12,7 +12,7 @@ Binaries are available from the [releases](https://github.com/reteps/dockerfmt/r
 A updated version of the dockfmt. Uses the dockerfile parser from moby/buildkit and the shell formatter from mvdan/sh.
 
 Usage:
-  dockerfmt [Dockerfile] [flags]
+  dockerfmt [Dockerfile...] [flags]
   dockerfmt [command]
 
 Available Commands:

cmd/version.go

@@ -14,6 +14,6 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of dockerfmt",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("dockerfmt 0.3.4")
+		fmt.Println("dockerfmt 0.3.5")
 	},
 }

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/dockerfmt",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "type": "module",
   "description": "",
   "repository": "git+https://github.com/reteps/dockerfmt/tree/main/js",

lib/format.go

@@ -406,7 +406,6 @@ func GetHeredoc(n *ExtendedNode) (string, bool) {
 		}
 		cur = cur.Next
 	}
-
 	content := strings.Join(args, " ") + "\n" + n.Node.Heredocs[0].Content + n.Node.Heredocs[0].Name + "\n"
 	return content, true
 }
@@ -520,9 +519,10 @@ func formatSpaceSeparated(n *ExtendedNode, c *Config) string {
 		if len(n.Node.Flags) > 0 {
 			cmd = strings.Join(n.Node.Flags, " ") + " " + cmd
 		}
+		cmd += "\n"
 	}
 
-	return strings.ToUpper(n.Node.Value) + " " + cmd + "\n"
+	return strings.ToUpper(n.Node.Value) + " " + cmd
 }
 
 func formatMaintainer(n *ExtendedNode, c *Config) string {

tests/in/heredoc.dockerfile

@@ -15,4 +15,8 @@ EOF
 
 COPY <<-EOT /script.sh
   echo "hello ${FOO}"
-EOT
+EOT
+COPY <<-EOF /x
+x
+EOF
+

tests/out/heredoc.dockerfile

@@ -13,7 +13,9 @@ COPY <<-EOF /x
 x
 EOF
 
-
 COPY <<-EOT /script.sh
   echo "hello ${FOO}"
 EOT
+COPY <<-EOF /x
+x
+EOF