Fix 197

Closes #197
NixOS · Jun 26, 2024 · 46a6d2a · 46a6d2a
1 parent c67a7b6
commit 46a6d2a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/Nixfmt/Parser.hs b/src/Nixfmt/Parser.hs
@@ -194,16 +194,18 @@ indentedStringPart =
   TextPart
     <$> someText
       ( chunk "''\\n"
-          <|> chunk "''\\r"
-          <|> chunk "''\\t"
-          <|> chunk "''\\"
-          *> (Text.singleton <$> anySingle)
-            <|> chunk "''$"
-            <|> chunk "'''"
-            <|> chunk "$$"
-            <|> try (chunk "$" <* notFollowedBy (char '{'))
-            <|> try (chunk "'" <* notFollowedBy (char '\''))
-            <|> someP (\t -> t /= '\'' && t /= '$' && t /= '\n')
+        <|> chunk "''\\r"
+        <|> chunk "''\\t"
+        <|> chunk "''\\'"
+        <|> chunk "''\\"
+        -- ''\ followed by any char throws away the ''\ part, leaving just the char
+        *> (Text.singleton <$> anySingle)
+        <|> chunk "''$"
+        <|> chunk "'''"
+        <|> chunk "$$"
+        <|> try (chunk "$" <* notFollowedBy (char '{'))
+        <|> try (chunk "'" <* notFollowedBy (char '\''))
+        <|> someP (\t -> t /= '\'' && t /= '$' && t /= '\n')
       )
 
 indentedLine :: Parser [StringPart]

diff --git a/test/correct/regression-197.nix b/test/correct/regression-197.nix
@@ -0,0 +1,3 @@
+''
+  ''\'''${A}
+''