aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock/Backends/Hyperlinker
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/ghc-9.4'Ben Gamari2022-08-051-9/+14
|\
| * 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)
| * Add support for \cases Jakob Brünker2022-04-011-0/+1
| | | | | | See merge request ghc/ghc!7873
| * 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-221-4/+1
| |/ | | | | | | | | | | 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.
| * 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-281-4/+4
| |
| * Adapt Haddock to Logger and Parser changes (#1399)Sylvain Henry2021-06-011-0/+3
| |
| * 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
| | |
| * | Add Haddock support for the OPAQUE pragma (#1380)Christiaan Baaij2021-05-131-0/+2
| |/
| * pprError changed name in GHCAlfredo Di Napoli2021-03-291-2/+2
| |
* | Follow hlint suggestion: redundant $. (#1505)Phil de Joux2022-07-241-1/+1
| | | | | | | | | | * Follow hlint suggestion: redundant $. * Remove $ and surplus blank lines in Operators.
* | Fix hyperlinks to external items and modules (#1482)Jade Lovelace2022-05-071-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 ```
* | Follow hlint, remove language pragmas in libs. (#1478)Phil de Joux2022-05-031-1/+0
| |
* | spelling errors (#1471)askeblad2022-04-061-1/+1
|/
* Match changes in GHC AST for in-tree API AnnotationsAlan Zimmerman2021-03-151-1/+1
| | | | As landed via https://gitlab.haskell.org/ghc/ghc/-/merge_requests/2418
* Add ITproj to parserShayne Fletcher2021-03-061-0/+1
|
* Merge remote-tracking branch 'origin/ghc-head' into wip/ghc-head-mergeBen Gamari2021-02-061-2/+2
|\
* \ Merge remote-tracking branch 'origin/ghc-9.0' into ghc-headBen Gamari2021-01-132-4/+3
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/ghc-8.10' into ghc-9.0Ben Gamari2021-01-052-3/+4
| |\
| | * Adapt Haddock for QualifiedDoMatthías Páll Gissurarson2020-12-081-2/+2
| | |
| | * Enable two warnings (#1245)tomjaguarpaw2020-12-081-0/+1
| | | | | | | | | | | | | | | because they will be soon be added to -Wall. See https://gitlab.haskell.org/ghc/ghc/-/issues/15656
| | * Merge branch 'ghc-8.8' into ghc-8.10Alec Theriault2020-03-202-2/+2
| | |\
| | | * Prefer un-hyperlinked sources to no sourcesAlec Theriault2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It is possible to fail to extract an HIE ast. This is however not a reason to produce _no_ output - we should still make a colorized HTML page.
| | | * Remove workaround for now-fixed Clang CPP bug (#1028)Alec Theriault2019-03-291-45/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before LLVM 6.0.1 (or 10.0 on Apple LLVM), there was a bug where lines that started with an octothorpe but turned out not to lex like pragmas would have an extra line added after them. Since this bug has been fixed upstream and that it doesn't have dire consequences anyways, the workaround is not really worth it anymore - we can just tell people to update their clang version (or re-structure their pragma code).
| * | | Updates for the new linear types syntax: a %p -> bVladislav Zavialov2020-09-301-0/+1
| | | |
* | | | Enable two warnings (#1245) (#1268)tomjaguarpaw2020-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | because they will be soon be added to -Wall. See https://gitlab.haskell.org/ghc/ghc/-/issues/15656
* | | | Revert "Enable two warnings (#1245) (#1268)"Ben Gamari2020-12-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | As this does not build on GHC `master`. This reverts commit 7936692badfe38f23ae95b51fb7bd7c2ff7e9bce.
* | | | Enable two warnings (#1245) (#1268)tomjaguarpaw2020-12-101-0/+1
| | | | | | | | | | | | | | | | | | | | because they will be soon be added to -Wall. See https://gitlab.haskell.org/ghc/ghc/-/issues/15656
* | | | GHC.Driver.Types refactoring (#1242)Sylvain Henry2020-10-261-1/+1
| | | |
* | | | Don't pass the HomeUnitId (#1239)Sylvain Henry2020-10-121-1/+0
| | | |
* | | | Adapt to GHC parser changesSylvain Henry2020-09-301-1/+2
| | | |
* | | | Update for parser (#1234)Sylvain Henry2020-09-291-3/+3
| | | |
* | | | Updates for the new linear types syntax: a %p -> bVladislav Zavialov2020-09-261-0/+1
| | | |
* | | | Match GHC for #18639, remove GENERATED pragmaAlan Zimmerman2020-09-071-2/+0
| | | |
* | | | Fix after HomeUnitSylvain Henry2020-08-121-1/+2
| | | |
* | | | Fix after Outputable refactoringSylvain Henry2020-08-052-2/+4
|/ / /
* | | Sync with GHC removing {-# CORE #-} pragmaKrzysztof Gogolewski2020-07-121-2/+0
| | | | | | | | | | | | See ghc ticket #18048
* | | Handle LexicalNegation's ITprefixminusVladislav Zavialov2020-06-281-0/+1
| | |
* | | Adapt Haddock for QualifiedDoMatthías Páll Gissurarson2020-06-261-2/+2
| | |
* | | Adapt Haddock to LinearTypesKrzysztof Gogolewski2020-06-172-2/+3
| | | | | | | | | | | | See ghc/ghc!852.
* | | Fix after unit refactoringSylvain Henry2020-06-081-1/+1
| | |
* | | update for hiefile-typeclass-infoZubin Duggal2020-05-241-14/+20
| | |
* | | Fix for GHC.Unit.* modulesSylvain Henry2020-04-271-1/+1
| | |
* | | Module structureSylvain Henry2020-04-243-7/+7
| | |
* | | Module renamingSylvain Henry2020-04-101-3/+4
| | |
* | | Modules: TypesSylvain Henry2020-03-183-9/+9
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 08:37:46 +0000