jira-wiki-markup 1.3.2 → 1.3.3
raw patch · 16 files changed
+42/−19 lines, 16 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- CHANGELOG.md +10/−0
- LICENSE +1/−1
- jira-wiki-markup.cabal +2/−2
- src/Text/Jira/Markup.hs +1/−1
- src/Text/Jira/Parser.hs +2/−2
- src/Text/Jira/Parser/Block.hs +1/−1
- src/Text/Jira/Parser/Core.hs +1/−1
- src/Text/Jira/Parser/Inline.hs +5/−3
- src/Text/Jira/Parser/PlainText.hs +1/−1
- src/Text/Jira/Parser/Shared.hs +1/−1
- src/Text/Jira/Printer.hs +1/−1
- test/Text/Jira/Parser/BlockTests.hs +1/−1
- test/Text/Jira/Parser/InlineTests.hs +8/−1
- test/Text/Jira/ParserTests.hs +5/−1
- test/Text/Jira/PrinterTests.hs +1/−1
- test/jira-wiki-markup-test.hs +1/−1
CHANGELOG.md view
@@ -4,6 +4,16 @@ `jira-wiki-markup` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +1.3.3+-----++Released 2021-02-12.++* Modified the Doc parser to skip leading blank lines. This fixes+ parsing of documents which start with multiple blank lines.++* Prevent URLs within link aliases to be treated as autolinks.+ 1.3.2 -----
LICENSE view
@@ -1,6 +1,6 @@ MIT License -Copyright © 2019–2020 Albert Krewinkel+Copyright © 2019–2021 Albert Krewinkel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
jira-wiki-markup.cabal view
@@ -1,6 +1,6 @@ cabal-version: 2.0 name: jira-wiki-markup-version: 1.3.2+version: 1.3.3 synopsis: Handle Jira wiki markup description: Parse jira wiki text into an abstract syntax tree for easy transformation to other formats.@@ -10,7 +10,7 @@ license-file: LICENSE author: Albert Krewinkel maintainer: tarleb@zeitkraut.de-copyright: © 2019–2020 Albert Krewinkel+copyright: © 2019–2021 Albert Krewinkel category: Text build-type: Simple extra-doc-files: README.md
src/Text/Jira/Markup.hs view
@@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-| Module : Text.Jira.Markup-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
src/Text/Jira/Parser.hs view
@@ -1,6 +1,6 @@ {-| Module : Text.Jira.Parser-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>@@ -33,4 +33,4 @@ -- | Parses a list of jira blocks into a @'Doc'@ element. doc :: JiraParser Doc-doc = Doc <$> many block <?> "doc"+doc = Doc <$> (skipMany blankline *> many block) <?> "doc"
src/Text/Jira/Parser/Block.hs view
@@ -1,6 +1,6 @@ {-| Module : Text.Jira.Parser.Block-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
src/Text/Jira/Parser/Core.hs view
@@ -1,6 +1,6 @@ {-| Module : Text.Jira.Parser.Core-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
src/Text/Jira/Parser/Inline.hs view
@@ -3,7 +3,7 @@ {-# LANGUAGE TupleSections #-} {-| Module : Text.Jira.Parser.Inline-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>@@ -180,8 +180,10 @@ -- | Parse a plain URL or mail address as @'AutoLink'@ element. autolink :: JiraParser Inline-autolink = AutoLink <$> (email' <|> url) <?> "email or other URL"- where email' = (\(URL e) -> URL ("mailto:" <> e)) <$> email+autolink = do+ guard . not . stateInLink =<< getState+ AutoLink <$> (email' <|> url) <?> "email or other URL"+ where email' = (\(URL e) -> URL ("mailto:" <> e)) <$> email -- | Parse a URL with scheme @file@, @ftp@, @http@, @https@, @irc@, @nntp@, or -- @news@.
src/Text/Jira/Parser/PlainText.hs view
@@ -1,6 +1,6 @@ {-| Module : Text.Jira.Parser.PlainText-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
@@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-| Module : Text.Jira.Parser.Shared-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
src/Text/Jira/Printer.hs view
@@ -2,7 +2,7 @@ {-# LANGUAGE LambdaCase #-} {-| Module : Text.Jira.Parser-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
test/Text/Jira/Parser/BlockTests.hs view
@@ -1,6 +1,6 @@ {-| Module : Text.Jira.Parser.BlockTests-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
test/Text/Jira/Parser/InlineTests.hs view
@@ -1,6 +1,6 @@ {-| Module : Text.Jira.Parser.InlineTests-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>@@ -255,6 +255,13 @@ parseJira link "[_important_ example|https://example.org]" @?= Right (Link External [Styled Emphasis [Str "important"], Space, Str "example"]+ (URL "https://example.org"))++ , testCase "alias with URL" $+ parseJira link "[https://example.org website|https://example.org]" @?=+ Right (Link External+ [ Str "https", SpecialChar ':', Str "//example.org"+ , Space, Str "website"] (URL "https://example.org")) , testCase "link to anchor" $
test/Text/Jira/ParserTests.hs view
@@ -1,6 +1,6 @@ {-| Module : Text.Jira.ParserTests-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>@@ -31,6 +31,10 @@ parse "h1. test\nThis is ok." @?= Right (Doc [ Header 1 [Str "test"] , Para [Str "This", Space, Str "is", Space, Str "ok."]])++ , testCase "leading blank lines" $+ parse "\n\ntext\n" @?=+ Right (Doc [Para [Str "text"]]) ] , testGroup "plainText"
test/Text/Jira/PrinterTests.hs view
@@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module : Text.Jira.PrinterTests-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>
test/jira-wiki-markup-test.hs view
@@ -1,6 +1,6 @@ {-| Module : Main-Copyright : © 2019–2020 Albert Krewinkel+Copyright : © 2019–2021 Albert Krewinkel License : MIT Maintainer : Albert Krewinkel <tarleb@zeitkraut.de>