Merge pull request #144 from guibou/fix_wrapping_141

fix: correctly remove indentation one line even if escaped line brake

ChangeLog.md

@@ -1,6 +1,8 @@
 # Revision history for PyF
 
-- Support for GHC 9.12
+- Fix indentation in `fmtTrim` when line break was escaped (bug https://github.com/guibou/PyF/issues/141).
+- Support for GHC 9.12.
+- Fix for tests in GHC 9.10.
 - No more "python" reference check in the test phase. I'm removing complexity,
   and if it does not match the python implementation, we can just introduce a
   new test case. Note that python checking can be reimplemented easilly by

src/PyF.hs

@@ -38,15 +38,18 @@ fmt = mkFormatter "fmt" fmtConfig
 
 -- | Format with whitespace trimming.
 fmtTrim :: QuasiQuoter
-fmtTrim = mkFormatter "fmtTrim" (addTrim fmtConfig)
+fmtTrim = let
+  qq = mkFormatter "fmtTrim" fmtConfig
+  in qq { quoteExp = \s -> quoteExp qq (trimIndent  s) }
 
 -- | Multiline string, no interpolation.
 str :: QuasiQuoter
 str = mkFormatter "str" strConfig
 
 -- | Multiline string, no interpolation, but does indentation trimming.
 strTrim :: QuasiQuoter
-strTrim = mkFormatter "strTrim" (addTrim strConfig)
+strTrim = let qq = mkFormatter "strTrim" strConfig
+  in qq { quoteExp = \s -> quoteExp qq (trimIndent  s) }
 
 -- | Raw string, neither interpolation nor escaping is performed.
 raw :: QuasiQuoter

test/Spec.hs

@@ -482,18 +482,18 @@ yeah\
                   hello
                   - a
                    - {
-                2 + 2
+                      2 + 2
                    :d}|]
         `shouldBe` "hello\n- a\n - 4"
 
-    it "behaves well with escaped first line" $ do
-      [fmtTrim|\
-                  - a
-                  - b
-                  |]
-        `shouldBe` "- a\n- b\n"
     it "Do not touch single lines" $ do
       [fmtTrim|  hello|] `shouldBe` "  hello"
+    it "trim when there is a linebreak" $ do
+      -- https://github.com/guibou/PyF/issues/141
+      [fmtTrim|
+          Cannot convert formula 2.0 * exponent(unit=s, value=1.0) which has unit dimensionless to\
+           unit dimensionless for they have different dimensions|]
+          `shouldBe` "Cannot convert formula 2.0 * exponent(unit=s, value=1.0) which has unit dimensionless to unit dimensionless for they have different dimensions"
   describe "raw" $ do
     it "does not escape anything" $
       [raw|hello