remove space in end of imports when formatting (#458)

src/Dhall/Core.hs

@@ -180,19 +180,18 @@ instance Semigroup ImportType where
 
 instance Buildable ImportType where
     build (Local prefix file) =
-        build prefix <> build file <> " "
+        build prefix <> build file
 
     build (URL prefix file suffix headers) =
             build prefix
         <>  build file
         <>  build suffix
         <>  foldMap buildHeaders headers
-        <>  " "
       where
         buildHeaders h = " using " <> build h
 
     build (Env env) =
-        "env:" <> build env <> " "
+        "env:" <> build env
 
 -- | How to interpret the import's contents (i.e. as Dhall code or raw text)
 data ImportMode = Code | RawText deriving (Eq, Ord, Show)

tests/Format.hs

@@ -39,6 +39,12 @@ formatTests =
         , should
             "indent then/else to the same column"
             "ifThenElse"
+        , should
+            "handle indenting long imports correctly without trailing space per line"
+            "importLines"
+        , should
+            "handle indenting small imports correctly without trailing space inline"
+            "importLines2"
         ]
 
 opts :: Data.Text.Prettyprint.Doc.LayoutOptions

tests/format/importLines2A.dhall

@@ -0,0 +1,2 @@
+let _ = ./emptyRecordA.dhall
+in let _ = ./emptyRecordA.dhall in 123

tests/format/importLines2B.dhall

@@ -0,0 +1 @@
+let _ = ./emptyRecordA.dhall in let _ = ./emptyRecordA.dhall in 123

tests/format/importLinesA.dhall

@@ -0,0 +1,7 @@
+let _ = ./emptyRecordA.dhall
+in  let _ = ./emptyRecordA.dhall
+in  let _ = ./emptyRecordA.dhall
+in  let _ = ./emptyRecordA.dhall
+in  let _ = ./emptyRecordA.dhall
+in  let _ = ./emptyRecordA.dhall
+in  123

tests/format/importLinesB.dhall

@@ -0,0 +1,13 @@
+    let _ = ./emptyRecordA.dhall
+
+in  let _ = ./emptyRecordA.dhall
+
+in  let _ = ./emptyRecordA.dhall
+
+in  let _ = ./emptyRecordA.dhall
+
+in  let _ = ./emptyRecordA.dhall
+
+in  let _ = ./emptyRecordA.dhall
+
+in  123