Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

building with lts-13.2 (ghc-8.6.3) #60

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

building with lts-13.2 (ghc-8.6.3) #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
764c3bc
building with lts-13.2 (ghc-8.6.3)
aviaviavi Jan 10, 2019
046c0a8
readme update
aviaviavi Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ support for this to be user configurable
### Installing

The easiest way to get toodles is via [stack](https://docs.haskellstack.org).
Just a `stack install --resolver=lts-12.14 toodles` and you're done! Alternatively, with GHC 8.4.3
Just a `stack install --resolver=lts-13.2 toodles` and you're done! Alternatively, with GHC 8.4.3
you can use [cabal](https://www.haskell.org/cabal/download.html). If there is
desire for it I can look into precompiled distribution.

Expand Down
38 changes: 19 additions & 19 deletions package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: toodles
version: 1.0.2
version: 1.1.0
github: "aviaviavi/toodles"
license: MIT
author: "Avi Press"
Expand Down Expand Up @@ -48,20 +48,20 @@ library:
- hspec >= 2.4.4
- hspec-expectations >=0.8.2
- MissingH >=1.4.0.1
- aeson ==1.3.1.1
- aeson >=1.3.1.1
- blaze-html ==0.9.1.1
- cmdargs ==0.10.20
- directory ==1.3.1.5
- megaparsec ==6.5.0
- directory >=1.3.1.5
- megaparsec >=6.5.0
- regex-posix ==0.95.2
- servant ==0.14.1
- servant >=0.14.1
- servant-blaze ==0.8
- servant-server ==0.14.1
- servant-server >=0.14.1
- strict ==0.3.2
- text ==1.2.3.1
- wai ==3.2.1.2
- warp ==3.2.25
- yaml ==0.8.32
- yaml >=0.8.32

executables:
toodles:
Expand All @@ -79,20 +79,20 @@ executables:
- hspec >= 2.4.4
- hspec-expectations >=0.8.2
- MissingH >=1.4.0.1
- aeson ==1.3.1.1
- aeson >=1.3.1.1
- blaze-html ==0.9.1.1
- cmdargs ==0.10.20
- directory ==1.3.1.5
- megaparsec ==6.5.0
- directory >=1.3.1.5
- megaparsec >=6.5.0
- regex-posix ==0.95.2
- servant ==0.14.1
- servant >=0.14.1
- servant-blaze ==0.8
- servant-server ==0.14.1
- servant-server >=0.14.1
- strict ==0.3.2
- text ==1.2.3.1
- wai ==3.2.1.2
- warp ==3.2.25
- yaml ==0.8.32
- yaml >=0.8.32

tests:
toodles-test:
Expand All @@ -110,17 +110,17 @@ tests:
- hspec >= 2.4.4
- hspec-expectations >=0.8.2
- MissingH >=1.4.0.1
- aeson ==1.3.1.1
- aeson >=1.3.1.1
- blaze-html ==0.9.1.1
- cmdargs ==0.10.20
- directory ==1.3.1.5
- megaparsec ==6.5.0
- directory >=1.3.1.5
- megaparsec >=6.5.0
- regex-posix ==0.95.2
- servant ==0.14.1
- servant >=0.14.1
- servant-blaze ==0.8
- servant-server ==0.14.1
- servant-server >=0.14.1
- strict ==0.3.2
- text ==1.2.3.1
- wai ==3.2.1.2
- warp ==3.2.25
- yaml ==0.8.32
- yaml >=0.8.32
22 changes: 11 additions & 11 deletions src/Parse.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ parseComment state fileExtension =
if state == ParseStateMultiLineComment
then do
let closingParser = symbol $ getMultiClosingForFileType fileExtension
lineWithClosing <- optional . try $ manyTill anyChar closingParser
lineWithOutClosing <- optional $ many anyChar
lineWithClosing <- optional . try $ manyTill anySingle closingParser
lineWithOutClosing <- optional $ many anySingle
return $ TodoBodyLine (T.pack (fromMaybe (fromJust lineWithOutClosing) lineWithOutClosing)) False (isJust lineWithClosing)
else do
single <- optional . try $ manyTill anyChar (symbol $ getCommentForFileType fileExtension)
singleComment <- optional . try $ manyTill anySingle (symbol $ getCommentForFileType fileExtension)
multi <-
if isJust single
if isJust singleComment
then return Nothing
else
optional . try $ manyTill anyChar (symbol $ getMultiOpeningForFileType fileExtension)
if isJust single || isJust multi
optional . try $ manyTill anySingle (symbol $ getMultiOpeningForFileType fileExtension)
if isJust singleComment || isJust multi
then do
b <- many anyChar
b <- many anySingle
return $ TodoBodyLine (T.pack b) (isJust multi) (getMultiClosingForFileType fileExtension `T.isInfixOf` T.pack b)
else
fail "No open comment marker found"
Expand Down Expand Up @@ -307,11 +307,11 @@ parseTodo state us path lineNum = try (parseTodoEntryHead us)
leadingTextMulti <- optional (try $ many spaceChar)
parseEntryHead NonOpenedComment (fromMaybe "" leadingTextMulti)
else do
entryLeadingTextSingle <- optional (try (manyTill anyChar (lookAhead . prefixParserForFileType $ getExtension path)))
entryLeadingTextSingle <- optional (try (manyTill anySingle (lookAhead . prefixParserForFileType $ getExtension path)))
entryLeadingTextMulti <-
if isNothing entryLeadingTextSingle
then
optional (manyTill anyChar (lookAhead . multiPrefixParserForFileType $ getExtension path))
optional (manyTill anySingle (lookAhead . multiPrefixParserForFileType $ getExtension path))
else
return Nothing

Expand Down Expand Up @@ -340,8 +340,8 @@ parseTodo state us path lineNum = try (parseTodoEntryHead us)
_ <- optional $ symbol "-"
_ <- optional $ symbol ":"
let closingParser = symbol $ getMultiClosingForFileType (getExtension path)
lineWithClosing <- optional . try $ manyTill anyChar closingParser
lineWithOutClosing <- optional $ many anyChar
lineWithClosing <- optional . try $ manyTill anySingle closingParser
lineWithOutClosing <- optional $ many anySingle
return $
TodoEntryHead
0
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-12.14
resolver: lts-13.2
pvp-bounds: both

# User packages to be built.
Expand Down
42 changes: 21 additions & 21 deletions toodles.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.31.0.
-- This file has been generated from package.yaml by hpack version 0.31.1.
--
-- see: https://github.com/sol/hpack
--
-- hash: eca068224b8e938feec8b371e63c8819e81e6d2030806c1f220e08823596b7f7
-- hash: 4a7203a62cb73d18a04c19e692b5d3e65c56cf8d5610cfe261c354b5f00bc335

name: toodles
version: 1.0.2
version: 1.1.0
synopsis: Manage the TODO entries in your code
description: Toodles scrapes your entire repository for TODO entries and organizes them so you can manage your project directly from the code. View, filter, sort, and edit your TODO\'s with an easy to use web application. When you make changes via toodles, the edits will be applied directly the TODO entries in your code. When you\'re done, commit and push your changes to share them with your team!
category: Project Management
Expand Down Expand Up @@ -51,23 +51,23 @@ library
ghc-options: -Wall -Wcompat
build-depends:
MissingH >=1.4.0.1
, aeson ==1.3.1.1
, aeson >=1.3.1.1
, base >=4.0 && <5
, blaze-html ==0.9.1.1
, cmdargs ==0.10.20
, directory ==1.3.1.5
, directory >=1.3.1.5
, hspec >=2.4.4
, hspec-expectations >=0.8.2
, megaparsec ==6.5.0
, megaparsec >=6.5.0
, regex-posix ==0.95.2
, servant ==0.14.1
, servant >=0.14.1
, servant-blaze ==0.8
, servant-server ==0.14.1
, servant-server >=0.14.1
, strict ==0.3.2
, text ==1.2.3.1
, wai ==3.2.1.2
, warp ==3.2.25
, yaml ==0.8.32
, yaml >=0.8.32
default-language: Haskell2010

executable toodles
Expand All @@ -85,23 +85,23 @@ executable toodles
ghc-options: -Wall -Wcompat -threaded -rtsopts -O3 -Wall -with-rtsopts=-N
build-depends:
MissingH >=1.4.0.1
, aeson ==1.3.1.1
, aeson >=1.3.1.1
, base >=4.0 && <5
, blaze-html ==0.9.1.1
, cmdargs ==0.10.20
, directory ==1.3.1.5
, directory >=1.3.1.5
, hspec >=2.4.4
, hspec-expectations >=0.8.2
, megaparsec ==6.5.0
, megaparsec >=6.5.0
, regex-posix ==0.95.2
, servant ==0.14.1
, servant >=0.14.1
, servant-blaze ==0.8
, servant-server ==0.14.1
, servant-server >=0.14.1
, strict ==0.3.2
, text ==1.2.3.1
, wai ==3.2.1.2
, warp ==3.2.25
, yaml ==0.8.32
, yaml >=0.8.32
default-language: Haskell2010

test-suite toodles-test
Expand All @@ -120,22 +120,22 @@ test-suite toodles-test
ghc-options: -Wall -Wcompat -threaded -rtsopts -with-rtsopts=-N -w
build-depends:
MissingH >=1.4.0.1
, aeson ==1.3.1.1
, aeson >=1.3.1.1
, base >=4.0 && <5
, blaze-html ==0.9.1.1
, cmdargs ==0.10.20
, directory ==1.3.1.5
, directory >=1.3.1.5
, hspec >=2.4.4
, hspec-expectations >=0.8.2
, megaparsec ==6.5.0
, megaparsec >=6.5.0
, regex-posix ==0.95.2
, servant ==0.14.1
, servant >=0.14.1
, servant-blaze ==0.8
, servant-server ==0.14.1
, servant-server >=0.14.1
, strict ==0.3.2
, text ==1.2.3.1
, toodles
, wai ==3.2.1.2
, warp ==3.2.25
, yaml ==0.8.32
, yaml >=0.8.32
default-language: Haskell2010