aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Differentiate between TH splices (line-links) and regular namesNiklas Haas2014-03-0911-140/+182
| | | | | | | | | | | | | | | | | This adds a new type of source code link, to a specific line rather than a specific declaration/name - this is used to link to the location of a TH splice that defines a certain name. Rather hefty changes throughout and still one unresolved issue (the line URLs aren't parsed from the third form of --read-interface which means they're currently restricted to same-interface links). Not sure if this issue is really worth all the hassle, especially since we could just use line links in general. This commit also contains some cleanup/clarification of the types in Haddock.Backends.Xhtml.Decl and shortens some overlong lines in the process. Notably, the Bool parameter was replaced by a Unicode type synonym to help clarify its presence in type signatures.
* Use optLast instead of listToMaybe for sourceUrls/wikiUrlsNiklas Haas2014-03-091-7/+6
| | | | | | This lets you override them using eg. cabal haddock --haddock-options, which can come in handy if you want to use a different layout or URL for your source code links than cabal-install generates.
* Reorder topDeclElem to move the source/wiki links to the topNiklas Haas2014-03-091-1/+1
| | | | | They appear in the same position due to the float: right attribute but now they're always at the top of the box instead of at the bottom.
* Render fixity informationNiklas Haas2014-03-0811-104/+621
| | | | | | Affects functions, type synonyms, type families, class names, data type names, constructors, data families, associated TFs/DFs, type synonyms, pattern synonyms and everything else I could think of.
* Change rendering of duplicate record field docsMateusz Kowalczyk2014-02-274-1/+215
| | | | | | | | See Haddock Trac #195. We now change this behaviour to only rendering the documentation attached to the first instance of a duplicate field. Perhaps we could improve this by rendering the first instance that has documentation attached to it but for now, we'll stick with this.
* Fix wording in the docsMateusz Kowalczyk2014-02-241-3/+3
|
* Fix rendering of Contents when links are presentMateusz Kowalczyk2014-02-244-22/+37
| | | | Fixes Haddock Trac #267.
* Add RankNTypes test case to ImplicitParams.hsNiklas Haas2014-02-232-2/+27
| | | | | | | This test actually tests what #260 originally reported - I omitted the RankNTypes scenario from the original fix because I realized it's not relevant to the underlying issue and indeed, this renders as intended now. Still good to have more tests.
* Lower precedence of equality constraintsNiklas Haas2014-02-233-70/+67
| | | | | | | This drops them to the new precedence pREC_CTX, which makes single eqaulity constraints show up as (a ~ b) => ty, in line with GHC's rendering. Additional tests added to make sure other type operators render as intended. Current behavior matches GHC
* Make ImplicitParams render correctly (#260)Niklas Haas2014-02-234-8/+112
| | | | | | This introduces a new precedence level for single contexts (because implicit param contexts always need parens around them, but other types of contexts don't necessarily, even when alone)
* Don't shadow ‘strip’.Mateusz Kowalczyk2014-02-231-4/+4
| | | | -Wall complains
* Update test case for lifted GADT type renderingMateusz Kowalczyk2014-02-231-1/+1
| | | | | | The parsing of these seems to have been fixed by GHC folk and it now renders differently. IMHO it now renders in a better way so I'm updating the test to reflect this.
* Turn a source code comment into specsSimon Hengel2014-02-222-9/+10
|
* Strip a single leading space from bird tracks (#201)Niklas Haas2014-02-226-19/+58
| | | | | | | | | | | | | | | | | | | | This makes bird tracks in the form > foo > bar > bat parse as if they had been written as >foo >bar >bat ie. without the leading whitespace in front of every line. Ideally we also want to look into how leading whitespace affects code blocks written using the @ @ syntax, which are currently unaffected by this patch.
* Use a bespoke data type to indicate fixityMateusz Kowalczyk2014-02-194-66/+66
| | | | | | This deals with what I imagine was an ancient TODO and makes it much clearer what the argument actually does rather than having the user chase down the comment.
* Add test case for inter-module type/data family instancesNiklas Haas2014-02-154-1/+112
| | | | | | | These should show up in every place where the class is visible, and indeed they do right now. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
* Only warn about missing docs when docs are missingMateusz Kowalczyk2014-02-131-1/+2
| | | | | This fixes the ‘Missing documentation for…’ message for modules with 100% coverage.
* Get rid of re-implementation of sortByNiklas Haas2014-02-131-7/+3
| | | | | | | I have no idea what this was doing lying around here, and due to the usage of tuples it's actually slower, too. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
* Add test case for PatternSynonymsnand2014-02-112-0/+263
| | | | | | | This just tests various stuff including poly-kinded patterns and operator patterns to make sure the rendering isn't broken. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
* Improve display of poly-kinded type operatorsnand2014-02-119-103/+280
| | | | | | | This now displays them as (==) k a b c ... to mirror GHC's behavior, instead of the old (k == a) b c ... which was just wrong. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
* Add support for type/data familiesnand2014-02-1118-237/+1003
| | | | | | | | This adds support for type/data families with their respective instances, as well as closed type families and associated type/data families. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
* Ensure a space between type signature and ‘Source’Mateusz Kowalczyk2014-02-101-2/+1
| | | | | | This is briefly related to Haddock Trac #249 and employs effectively the suggested fix _but_ it doesn't actually fix the reported issue. This commit simply makes copying the full line a bit less of a pain.
* Insert a space between module link and descriptionMateusz Kowalczyk2014-02-101-1/+1
| | | | Fixes Haddock Trac #277.
* Document module header.Mateusz Kowalczyk2014-02-091-8/+62
| | | | Fixes Haddock Trac #270.
* Correct whitespace in ‘hidden’ test for <+> changeMateusz Kowalczyk2014-01-301-4/+4
|
* Handle infix vs prefix names correctly everywhere, by explicitly specifying ↵Dr. ERDI Gergo2014-01-315-59/+69
| | | | | | the context The basic idea is that "a" and "+" are either pretty-printed as "a" and "(+)" or "`a`" and "+"
* Update testsMateusz Kowalczyk2014-01-303-3/+3
| | | | | This updates tests due to Haddock Trac #271 fix and due to removal of TypeHoles as an extension from GHC.
* Fix @ code blocksMateusz Kowalczyk2014-01-302-0/+9
| | | | | | In cases where we had some horizontal space before the closing ‘@’, the parser would not accept the block as a code block and we'd get ugly output.
* <+>: Don't insert a space when concatenating empty nodesDr. ERDI Gergo2014-01-3124-225/+227
|
* Update CPP check for __GLASGOW_HASKELL__Austin Seipp2014-01-291-1/+1
| | | | Signed-off-by: Austin Seipp <austin@well-typed.com>
* Support for -XPatternSynonymsDr. ERDI Gergo2014-01-198-33/+156
| | | | Signed-off-by: Austin Seipp <austin@well-typed.com>
* Fixes #271Mateusz Kowalczyk2014-01-132-1/+3
| | | | Signed-off-by: Austin Seipp <austin@well-typed.com>
* Update maintainerMateusz Kowalczyk2014-01-121-1/+1
|
* Update documentation.Mateusz Kowalczyk2014-01-122-76/+271
|
* Allow escaping in URLs and pictures.Mateusz Kowalczyk2014-01-123-143/+190
| | | | | | | | | Some tests were moved under parseString as they weren't about paragraph level markup. Conflicts: src/Haddock/Parser.hs test/Haddock/ParserSpec.hs
* Allow for nesting of paragraphs under lists.Mateusz Kowalczyk2014-01-1210-89/+613
| | | | | | | | | | | | | | | | | The nesting rules are similar to Markdown's with the exception that we can not simply indent the first line of a hard wrapped indented paragraph and have it treated as if it was fully indented. The reason is differences in markup as some of our constructs care about whitespace while others just swallow everything up so it's just a lot easier to not bother with it rather than making arbitrary rules. Note that we now drop trailing for string entities inside of lists. They weren't needed and it makes the output look uniform whether we use a single or double newline between list elements. Conflicts: src/Haddock/Parser.hs test/Haddock/ParserSpec.hs
* Bump interface versionMateusz Kowalczyk2014-01-122-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were some breaking changes over the last few patches so we bump the interface version. This causes a big problem with testing: 1. To generate cross package docs, we first need to generate docs for the package used. 2. To generate package docs with new interface version, we need to use Haddock which has the version bumped. 3. To get Haddock with the version bump, we first need to test cross package docs 4. GOTO 1 So the problem is the chicken and the egg problem. It seems that the only solution would be to generate some interface files on the fly but it is non-trivial. To run this test, you'll have to: * build Haddock without the test (make sure everything else passes) * rebuild the packages used in the test with your shiny new binary making sure they are visible to Haddock * remove the ‘_hidden’ suffix and re-run the tests Note: because the packages currently used for this test are those provided by GHC, it's probably non-trivial to just re-build them. Preferably something less tedious to rebuild should be used and something that is not subject to change.
* Per-module extension flags and language listing.Mateusz Kowalczyk2014-01-1212-48/+209
| | | | | | | | | | | | | Any extensions that are not enabled by a used language (Haskell2010 &c) will be shown. Furthermore, any implicitly enabled are also going to be shown. While we could eliminate this either by using the GHC API or a dirty hack, I opted not to: if a user doesn't want the implied flags to show, they are recommended to use enable extensions more carefully or individually. Perhaps this will encourage users to not enable the most powerful flags needlessly. Enabled with show-extensions. Conflicts: src/Haddock/InterfaceFile.hs
* Allow for headings inside function documentation.Mateusz Kowalczyk2014-01-129-8/+89
| | | | | | | | | | | | | LaTeX will treat the h3-h6 headings the same as we'd have to hack the style file heavily otherwise and it would make the headings tiny anyway. Hoogle upstream said they will put in the functionality on their end. Conflicts: src/Haddock/Interface/Rename.hs src/Haddock/Types.hs test/Haddock/ParserSpec.hs
* Support for bold.Mateusz Kowalczyk2014-01-1215-14/+244
| | | | | | | Conflicts: src/Haddock/Backends/Hoogle.hs src/Haddock/Interface/Rename.hs src/Haddock/Parser.hs
* Update acceptance testsSimon Hengel2014-01-121-2/+8
|
* Fix totality, unicode, examples, paragraph parsingSimon Hengel2014-01-1248-1190/+871
| | | | | | | | Also simplify specs and parsers while we're at it. Some parsers were made more generic. This commit is a part of GHC pre-merge squash, email fuuzetsu@fuuzetsu.co.uk if you need the full commit history.
* Don't append newline to parseString inputSimon Hengel2014-01-1264-385/+272
| | | | We also check that we have parsed everything with endOfInput.
* Rename Haddock.ParseSpec to Haddock.ParserSpecSimon Hengel2014-01-123-11/+3
|
* One pass parser and tests.Mateusz Kowalczyk2014-01-1220-662/+986
| | | | | | | | We remove the HTML test as it is no longer necessary. We cover the test case in spec tests and other HTML tests but keeping this around fails: this is because the new parser has different semantics there. In fact, I suspect the original behaviour was a bug that wasn't caught/fixed but simply included as-is during the testing.
* Add ByteString version of AttoparsecMateusz Kowalczyk2014-01-1211-18/+2034
|
* Fix warnings in test helperSimon Hengel2014-01-121-0/+16
|
* Some code simplification by using traverseSimon Hengel2014-01-122-52/+9
|
* Adapt to small change in Pretty's exportsSimon Peyton Jones2014-01-101-3/+3
|
* Track changes in HsSpliceTy data constructorSimon Peyton Jones2013-11-251-1/+1
|