aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #512 from phadej/oleg-fixesSebastian Méric de Bellefon2016-06-063-3/+15
|\ | | | | Fixes for #508 and #510
| * Change Hyperlinked lexer to know about DataKinds ticksOleg Grenrus2016-05-242-1/+14
| |
| * UnfelpfulSpan line number omittedOleg Grenrus2016-05-241-2/+1
| | | | | | | | Kind of resolves https://github.com/haskell/haddock/issues/508
* | Matching changes for #12105Alan Zimmerman2016-05-295-5/+11
| |
* | Merge remote-tracking branch 'RyanGlScott/ghc-head' into ghc-headBen Gamari2016-05-114-11/+34
|\ \
| * | Render Haddocks for derived instancesRyan Scott2016-05-044-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, one can document top-level instance declarations, but derived instances (both those in `deriving` clauses and standalone `deriving` instances) do not enjoy the same privilege. This makes the necessary changes to the Haddock API to enable rendering Haddock comments for derived instances. This is part of a fix for Trac #11768.
* | | Merge remote-tracking branch 'origin/master' into ghc-headBen Gamari2016-05-111-1/+1
|\ \ \ | |/ / |/| / | |/
| * Create: Mark a comment as TODOBen Gamari2016-05-101-1/+1
| |
| * Remove unused functionsMatthew Pickering2016-04-162-37/+0
| | | | | | | | (cherry picked from commit b89d1c2456bdb2d4208d94ded56155f7088a37d0)
| * Ensure expanded family instances render correctlyRyanGlScott2016-04-162-3/+4
| | | | | | | | (cherry picked from commit 1338b5d7c32939de6bbc31af0049477e4f847103)
| * Collapse type/data family instances by defaultRyanGlScott2016-04-162-10/+23
| | | | | | | | (cherry picked from commit 2da130a8db8f995c119b544fad807533236cf088)
| * Fix printing of pattern synonym typesRik Steenkamp2016-04-041-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | Removes the call to `patSynType :: PatSyn -> Type` in `Convert.hs` as this function will be removed from GHC. Instead, we use the function `patSynSig` and build the `HsDecl` manually. This also fixes the printing of the two contexts and the quantified type variables in a pattern synonym type. Reviewers: goldfire, bgamari, mpickering Differential Revision: https://phabricator.haskell.org/D2048 (cherry picked from commit 3ddcbd6b8e6884bd95028381176eb33bee6896fb)
| * Changes due to fix for GHC#11648.Richard Eisenberg2016-03-156-11/+17
| | | | | | | | (cherry picked from commit bb994de1ab0c76d1aaf1e39c54158db2526d31f1)
| * Follow-on changes to support RuntimeRepRichard Eisenberg2016-03-131-5/+4
| | | | | | | | (cherry picked from commit ab954263a793d8ced734459d6194a5d89214b66c)
* | Track change to HsGroupSimon Peyton Jones2016-04-201-2/+2
| | | | | | | | This relates to a big GHC patch for Trac #11348
* | Merge pull request #489 from mpickering/unused-functionsBen Gamari2016-04-162-37/+0
|\ \ | | | | | | Remove some unused functions
| * | Remove unused functionsMatthew Pickering2016-03-042-37/+0
| | |
* | | Merge pull request #482 from RyanGlScott/ghc-headBen Gamari2016-04-162-12/+26
|\ \ \ | | | | | | | | Collapse type/data family instances by default
| * | | Ensure expanded family instances render correctlyRyanGlScott2016-02-112-3/+4
| | | |
| * | | Collapse type/data family instances by defaultRyanGlScott2016-02-112-10/+23
| | | |
* | | | Fix printing of pattern synonym typesRik Steenkamp2016-04-021-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the call to `patSynType :: PatSyn -> Type` in `Convert.hs` as this function will be removed from GHC. Instead, we use the function `patSynSig` and build the `HsDecl` manually. This also fixes the printing of the two contexts and the quantified type variables in a pattern synonym type. Reviewers: goldfire, bgamari, mpickering Differential Revision: https://phabricator.haskell.org/D2048
* | | | Changes due to fix for GHC#11648.Richard Eisenberg2016-03-146-11/+17
| |/ / |/| |
* | | Follow-on changes to support RuntimeRepRichard Eisenberg2016-02-241-5/+4
| | |
* | | Merge remote-tracking branch 'origin/master' into ghc-headBen Gamari2016-02-181-9/+22
|\ \ \ | | |/ | |/|
| * | Xhtml.Decl: Show 'where ...' after closed type familyBen Gamari2016-02-181-0/+5
| | | | | | | | | | | | | | | Seems like we should ideally show the actual equations as well but that seems like it would be a fair amount of work
| * | Xhtml.Decl: Show kind signatures for type family variablesBen Gamari2016-02-181-4/+11
| | | | | | | | | | | | Addresses GHC #11588.
| * | Xhtml.Decl: Various cleanupsBen Gamari2016-02-181-5/+6
| | |
* | | Merge remote-tracking branch 'origin/master' into ghc-headBen Gamari2016-02-124-23/+27
|\| | | |/ |/|
| * Move the permalinks to "#" on the right sidePhil Ruffwind2016-02-083-8/+11
| | | | | | | | | | | | | | | | | | Since pull request #407, the identifiers have been permalinked to themselves, but this makes it difficult to copy the identifier by double-clicking. To work around this usability problem, the permalinks are now placed on the far right adjacent to "Source", indicated by "#". Also, 'namedAnchor' now uses 'id' instead of 'name' (which is obsolete).
| * Merge pull request #477 from haskell/issue-475Ben Gamari2016-02-071-15/+16
| |\ | | | | | | Make sure --mathjax affects all written HTML files
| | * Make sure --mathjax affects all written HTML filesJoachim Breitner2016-01-191-15/+16
| | | | | | | | | | | | This fixes #475.
* | | Merge branch 'master' into ghc-headBen Gamari2016-02-071-3/+13
|\| |
| * | Render */# instead of TYPE 'Lifted/TYPE 'Unlifted (fixes #473)RyanGlScott2016-02-071-3/+14
| |/
| * deal with un-wiring of IP classEric Seidel2016-01-181-3/+3
| | | | | | | | (cherry picked from commit 17388b0f0029d969d79353be7737eb01c7b8dc5f)
| * Update to match wip/T11430 in GHCAlan Zimmerman2016-01-161-1/+1
| |
* | Merge remote-tracking branch 'gridaphobe/ghc-head' into ghc-headBen Gamari2016-01-181-3/+3
|\ \
| * | deal with un-wiring of IP classEric Seidel2016-01-111-3/+3
| | |
* | | Update to match wip/T11430 in GHCAlan Zimmerman2016-01-151-1/+1
|/ /
* | Merge branch 'master' into ghc-headBen Gamari2016-01-061-1/+1
|\|
| * Version bumps and changelogBen Gamari2016-01-061-1/+1
| |
* | tweak version bounds for GHC-8.1Herbert Valerio Riedel2015-12-301-1/+1
|/
* Add missing importBen Gamari2015-12-261-0/+1
|
* Merge remote-tracking branch 'idontgetoutmuch/ghc-head' into ghc-headBen Gamari2015-12-259-12/+54
|\
| * Fix the documentation for haddock itself.Dominic Steinitz2015-12-219-15/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change notation and add support for inline math. Allow newlines in display math. Add a command line option for the mathjax url (you might want to use a locally installed version). Rebase tests because of extra url and version change. Respond to (some of the) comments. Fix warnings in InterfaceFile.hs
| * Handle inline math with mathjax.Dominic Steinitz2015-12-217-0/+13
| |
* | Merge remote-tracking branch 'origin/ghc-head' into ghc-headBen Gamari2015-12-235-11/+5
|\ \
| * | Follow removal of NamedWildCard from HsTypeSimon Peyton Jones2015-12-223-6/+0
| | |
| * | Fix-up left-over assumptions of GHC 7.12 into GHC 8.0Herbert Valerio Riedel2015-12-211-1/+1
| | |
| * | Update for GHC trac#11258Alan Zimmerman2015-12-203-4/+4
| |/ | | | | | | Adding locations to RdrName in FieldOcc and AmbiguousFieldOcc
* | Merge remote-tracking branch 'phadej/orphans' into ghc-headBen Gamari2015-12-208-27/+90
|\ \