diff options
author | Jade Lovelace <software@lfcode.ca> | 2022-05-07 08:42:08 -0700 |
---|---|---|
committer | Douglas Wilson <douglas.wilson@gmail.com> | 2022-07-29 11:02:41 +0100 |
commit | 2036454bf6a86e14d9da9da5a19ce49ff3975fd7 (patch) | |
tree | e88aa191bea3974c290f558db8cc480fcf08ef29 /haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs | |
parent | 2368e9329e6600b46000abd24ec00b7e27bcae75 (diff) |
Fix hyperlinks to external items and modules (#1482)
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)
Diffstat (limited to 'haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs')
0 files changed, 0 insertions, 0 deletions