aboutsummaryrefslogtreecommitdiff
path: root/haddock-api
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/main'Yuchen Pei2022-08-1622-435/+375
|\
| * Bump the versionsHécate Moonlight2022-08-051-2/+2
| |
| * Clean up build and testsuite for GHC 9.4Ben Gamari2022-08-058-36/+10
| |
| * Merge remote-tracking branch 'origin/ghc-9.4'Ben Gamari2022-08-0519-398/+364
| |\
| | * Fix hyperlinks to external items and modules (#1482)Jade Lovelace2022-07-291-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1481. There were two bugs in this: * We were assuming that we were always getting a relative path to the module in question, while Nix gives us file:// URLs sometimes. This change checks for those and stops prepending `..` to them. * We were not linking to the file under the module. This seems to have been a regression introduced by #977. That is, the URLs were going to something like file:///nix/store/3bwbsy0llxxn1pixx3ll02alln56ivxy-ghc-9.0.2-doc/share/doc/ghc/html/libraries/base-4.15.1.0/src which does not have the appropriate HTML file or fragment for the item in question at the end. There is a remaining instance of the latter bug, but not in the hyperlinker: the source links to items reexported from other modules are also not including the correct file name. e.g. the reexport of Entity in esqueleto, from persistent. NOTE: This needs to get tested with relative-path located modules. It seems correct for Nix based on my testing. Testing strategy: ``` nix-shell '<nixpkgs>' --pure -A haskell.packages.ghc922.aeson mkdir /tmp/aesonbuild && cd /tmp/aesonbuild export out=/tmp/aesonbuild/out genericBuild ln -sf $HOME/co/haddock/haddock-api/resources . ./Setup haddock --with-haddock=$HOME/path/to/haddock/exec --hyperlink-source ``` (cherry picked from commit ab53ccf089ea703b767581ac14be0f6c78a7678a)
| | * Revert "HsToken ConDeclGADT con_dcolon"Ben Gamari2022-04-292-4/+1
| | | | | | | | | | | | This reverts commit 24208496649a02d5f87373052c430ea4a97842c5.
| | * Merge remote-tracking branch 'origin/ghc-head' into ghc-9.4Ben Gamari2022-04-294-7/+10
| | |\
| | | * Bump ghc version to 9.5Ben Gamari2022-04-251-2/+2
| | | |
| | | * Merge remote-tracking branch 'upstream/ghc-9.2' into ghc-headBen Gamari2022-04-252-6/+6
| | | |\
| | | * | HsToken ConDeclGADT con_dcolonVladislav Zavialov2022-04-072-1/+4
| | | | |
| | * | | Update for GHC 9.4Ben Gamari2022-04-231-2/+2
| | |/ /
| | * | Add support for \cases Jakob Brünker2022-04-011-0/+1
| | | | | | | | | | | | See merge request ghc/ghc!7873
| | * | Keep track of promotion ticks in HsOpTysheaf2022-04-017-24/+31
| | | | | | | | | | | | | | | | | | | | Keeping track of promotion ticks in HsOpTy allows us to properly pretty-print promoted constructors such as lists.
| | * | Merge branch 'wip/opaque_pragma' into 'ghc-head'Matthew Pickering2022-03-241-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | Add Haddock support for the OPAQUE pragma See merge request ghc/haddock!2
| | | * | Add Haddock support for the OPAQUE pragmaChristiaan Baaij2022-03-161-0/+2
| | | | |
| | * | | Minimum changes needed for compilation with hi-haddockMatthew Pickering2022-03-227-53/+79
| | |/ / | | | | | | | | | | | | | | | | | | | | With hi-haddock, of course there is a much large refactoring of haddock which could be achieved but that is left for a future patch which can implemented at any time independently of GHC.
| | * | Link to (~)Vladislav Zavialov2022-03-142-0/+2
| | | |
| | * | Fix CollectPass instance to match TTG refactorJohn Ericson2022-03-111-1/+3
| | | | | | | | | | | | | | | | Companion to GHC !7614 (https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7614)
| | * | Remove use of ExtendedModSummaryMatthew Pickering2021-12-281-5/+5
| | | |
| | * | Fix for new Plugins datatypeSylvain Henry2021-12-171-6/+8
| | | |
| | * | Update after NoExtCon -> DataConCantHappen renameKrzysztof Gogolewski2021-11-272-13/+13
| | | |
| | * | Do not use forall as an identifierVladislav Zavialov2021-11-051-2/+2
| | | | | | | | | | | | | | | | See GHC ticket #20609
| | * | Update for changes in GHC for branchAlan Zimmerman2021-10-283-12/+12
| | | | | | | | | | | | | | | | wip/az/no-srcspan-anno-instances
| | * | Fix after PkgQual refactoring (#1429)Sylvain Henry2021-10-151-10/+7
| | | |
| | * | Enable Haddock tests in GHC windows CI (#1428)wz10002021-10-112-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * testsuite: strip windows line endings for haddock * hyperlinker: Work around double escaping (#19236) * deterministic SCC
| | * | coot/multiple package (ghc-head) (#1419)Marcin Szamotulski2021-08-1612-118/+7000
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * FromJSON class Aeson style FromJSON class with Parsec based json parser. * doc-index.json file for multiple packages When creating haddock summary page for multiple packages render doc-index.json file using contents of all found 'doc-index.json' files. * Render doc-index.json When rendering html, render doc-index.json file independently of maybe_index_url option. doc-index.json file is useful now even if maybe_index_url is not `Nothing`. * base url option New `Flag_BaseURL` which configures from where static files are loaded (--base-url). If given and not equal "." static files are not coppied, as this indicates that they are not read from the the directory where we'd copy them. The default value is ".".
| | * | Rename getErrorMessages Lexer importAlfredo Di Napoli2021-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This commit renames the Lexer import in `Hyperlinker.Parser` from `getErrorMessages` to `getPsErrorMessages` to eliminate the ambiguity with the `getErrorMessages` function defined in `GHC.Types.Error`.
| | * | Fix mkParserOpts (#1411)Sylvain Henry2021-06-282-5/+4
| | | |
| | * | HsToken in FunTy, RecConGADTVladislav Zavialov2021-06-108-26/+27
| | | |
| | * | Adapt Haddock to Logger and Parser changes (#1399)Sylvain Henry2021-06-014-17/+19
| | | |
| | * | CI configuration for ghc-head (#1395)Ben Simms2021-05-281-1/+1
| | | |
| | * | Revert "Add Haddock support for the OPAQUE pragma (#1380)"Ben Gamari2021-05-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1337c599ef7720b0482a25c55f11794112496dc. The GHC patch associated with this change is not yet ready to be merged.
| | * | Merge pull request #1394 from adinapoli/wip/adinapoli-align-ps-messagesBen Gamari2021-05-241-3/+5
| | |\ \ | | | | | | | | | | Align Haddock to use the new Parser diagnostics interface
| | | * | New Parser diagnostics interfaceAlfredo Di Napoli2021-05-241-3/+5
| | | | |
| | * | | Merge commit '3b6a8774bdb543dad59b2618458b07feab8a55e9' into ghc-headBen Gamari2021-05-218-47/+46
| | |\| |
| | | * | FieldOcc: rename extFieldOcc to foExtShayne Fletcher2021-05-225-11/+11
| | | | |
| | | * | Remove Maybe from HsQualTyAlan Zimmerman2021-05-208-34/+33
| | | | | | | | | | | | | | | | | | | | Match changes in GHC for #19845
| | | * | EPA: match changes from GHC T19834Alan Zimmerman2021-05-131-2/+2
| | | | |
| | * | | Add Haddock support for the OPAQUE pragma (#1380)Christiaan Baaij2021-05-131-0/+2
| | |/ /
| | * | Account for HsVersions.h removalSylvain Henry2021-05-111-8/+6
| | | |
| | * | Update for EPA changes in GHCAlan Zimmerman2021-05-112-25/+25
| | | |
| | * | Revert "Removal of HsVersions.h (#1388)"Hécate Moonlight2021-05-113-31/+33
| | | | | | | | | | | | | | | | This reverts commit 72118896464f94d81f10c52f5d9261efcacc57a6.
| | * | Removal of HsVersions.h (#1388)Sylvain Henry2021-05-113-33/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update for EPA changes in GHC * Account for HsVersions.h removal Co-authored-by: Alan Zimmerman <alan.zimm@gmail.com>
| | * | Bump GHC version to 9.3Ben Gamari2021-04-101-3/+3
| | | |
| | * | Merge remote-tracking branch 'upstream/ghc-head' into ghc-headBen Gamari2021-03-311-2/+2
| | |\ \
| | | * | pprError changed name in GHCAlfredo Di Napoli2021-03-291-2/+2
| | | | |
| | * | | EPA : Rename ApiAnn to EpAnnAlan Zimmerman2021-03-292-28/+25
| | |/ /
| | * | Add UnitId to Target recordFendor2021-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This way we always know to which home-unit a given target belongs to. So far, there only exists a single home-unit at a time, but it enables having multiple home-units at the same time.
| | * | NameCache doesn't store a UniqSupply anymoreSylvain Henry2021-03-221-12/+2
| | | |
| | * | Fix after NameCache changesSylvain Henry2021-03-224-157/+36
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 11:43:12 +0000