Merge pull request #18 from nicholassaunders/bug/parse-same-line-comm…

…ents Fix parsing same-line comments; resolves #17.
nsaunders · May 31, 2019 · ff1925d · ff1925d
2 parents 5853d0b + 7ddc8ab
commit ff1925d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Dotenv/Internal/Parse.purs b/src/Dotenv/Internal/Parse.purs
@@ -71,4 +71,4 @@ value = (quotedValue '"' <|> quotedValue '\'' <|> unquotedValue) <?> "variable v
 
 -- | Parses a setting in the form of `NAME=value`.
 setting :: Parser String Setting
-setting = Tuple <$> name <*> value
+setting = Tuple <$> name <*> value <* many (noneOf newlineChars)
diff --git a/test/Parse.purs b/test/Parse.purs
@@ -29,8 +29,8 @@ tests = describe "settings parser" do
 
   it "skips comments on the same line after a setting" $
     let
-      expected = Right [ Tuple "A" $ LiteralValue "B", Tuple "C" $ LiteralValue "D" ]
-      actual = "A=B\nC=D # Testing" `runParser` settings
+      expected = Right [ Tuple "A" $ LiteralValue "B", Tuple "C" $ LiteralValue "D", Tuple "E" $ LiteralValue "F" ]
+      actual = "A=B\nC=D # Testing\nE=F" `runParser` settings
     in
       actual `shouldEqual` expected