aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock
Commit message (Collapse)AuthorAgeFilesLines
* Render module tree per package in the content page (#1492)Marcin Szamotulski2022-06-073-36/+146
| | | | | | | | | | | | | * Render module tree per package in the content page When rendering content page for multiple packages it is useful to split the module tree per package. Package names in this patch are inferred from haddock's interface file names. * Write PackageInfo into interface file To keep interface file format backward compatible, instead of using `Binary` instance for `InterfaceFile` we introduce functions to serialise and deserialise, which depends on the interface file version.
* Check if doc-index.json exists before reading it (#1488)Marcin Szamotulski2022-05-241-4/+9
|
* Allow to hide interfaces when rendering multiple components (#1487)Marcin Szamotulski2022-05-211-5/+19
| | | | | This is useful when one wishes to `--gen-contents` when rendering multiple components, but one does not want to render all modules. This is in particular useful when adding base package.
* 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 ```
* Keep track of ordered list indexes and render them (#1407)Ben Simms2022-05-035-6/+15
| | | | | * Keep track of ordered list indexes and render them * Rename some identifiers to clarify
* Follow hlint, remove language pragmas in libs. (#1478)Phil de Joux2022-05-037-7/+2
|
* Follow hlint suggestion to remove redundant bang. (#1479)Phil de Joux2022-05-031-1/+1
|
* Remove unused imports that GHC warned about. (#1480)Phil de Joux2022-05-032-4/+0
|
* Add hlint action .hlint.yaml with ignores & CPP. (#1475)Phil de Joux2022-05-022-0/+3
|
* spelling errors (#1471)askeblad2022-04-065-7/+7
|
* typos (#1464)askeblad2022-03-165-5/+5
|
* fix CI for 9.2 (#1436)Artem Pelenitsyn2021-11-271-1/+0
|
* coot/multiple packages (ghc-9.2) (#1418)Marcin Szamotulski2021-08-087-61/+623
|
* EPA: match changes from GHC T19834Alan Zimmerman2021-07-281-2/+2
| | | | (cherry picked from commit 2fec1b44e0ee7e263286709aa528b4ecb99ac6c2)
* Update for EPA changes in GHCAlan Zimmerman2021-04-192-25/+25
| | | | (cherry picked from commit cafb48118f7c111020663776845897e225607b41)
* EPA : Rename ApiAnn to EpAnnAlan Zimmerman2021-03-292-28/+25
|
* Bump GHC version to 9.2Ben Gamari2021-03-221-1/+1
|
* Match changes in GHC AST for in-tree API AnnotationsAlan Zimmerman2021-03-1516-336/+386
| | | | As landed via https://gitlab.haskell.org/ghc/ghc/-/merge_requests/2418
* Implement template-haskell's putDocLuke Lau2021-03-102-12/+47
| | | | | | | | | This catches up to GHC using the new extractTHDocs function, which returns documentation added via the putDoc function (provided it was compiled with Opt_Haddock). Since it's already a map from names -> docs, there's no need to do traversal etc. It also matches the change from the argument map being made an IntMap rather than a Map Int
* Update for "FastString: Use FastMutInt instead of IORef Int"Ben Gamari2021-03-101-4/+2
|
* Update for boxed repAndrew Martin2021-03-072-5/+6
|
* Merge remote-tracking branch 'origin/ghc-head' into HEADBen Gamari2021-03-063-73/+98
|\
| * Fix the call-site of guessTarget in Interface.hsHécate Moonlight2021-02-231-2/+2
| | | | | | | | Explicit the imports from GHC.HsToCore.Docs
| * Explicit imports for Haddock.Interface and Haddock.Interface.CreateHécate Moonlight2021-02-222-47/+50
| |
| * Clean-up of Interface and Interface.Create's imports and pragmataHécate Moonlight2021-02-222-33/+41
| |
| * Merge pull request #1311 from fendor/wip/add-targetUnitId-to-targetHécate Moonlight2021-02-211-1/+1
| |\ | | | | | | Add UnitId to Target record
| | * Add UnitId to Target recordFendor2021-02-091-1/+1
| | |
| * | Add import list to Data.List in Haddock.Interface.CreateOleg Grenrus2021-02-141-1/+1
| | |
| * | Merge pull request #1329 from hsyl20/hsyl20/stabe_ifaceHécate Moonlight2021-02-111-10/+24
| |\ \ | | |/ | |/| Stable sort for instances
| | * Also make TyLit deterministicalexbiehl2021-02-111-2/+7
| | |
| | * Stable sort for (data/newtype) instancesalexbiehl2021-02-111-8/+17
| | |
* | | Add ITproj to parserShayne Fletcher2021-03-061-0/+1
| | |
* | | Context becomes a Maybe in the GHC ASTAlan Zimmerman2021-02-228-34/+49
|/ / | | | | | | | | | | This prevents noLoc's appearing in the ParsedSource. Match the change in GHC.
* | Fix to build with HEADSylvain Henry2021-02-092-3/+3
| |
* | Merge pull request #1310 from hsyl20/wip/hsyl20/logger2Alexander Biehl2021-02-082-9/+12
|\ \ | | | | | | Logger refactoring
| * | Update for LoggerSylvain Henry2021-02-082-9/+12
| |/
* | Merge branch 'ghc-head' into ghc-9.0alexbiehl-gc2021-02-0721-904/+1260
|\|
| * Merge commit '41964cb2fd54b5a10f8c0f28147015b7d5ad2c02' into wip/ghc-head-mergeBen Gamari2021-02-063-0/+3
| |\
| | * Merge commit 'a917dfd29f3103b69378138477514cbfa38558a9' into ghc-headVladislav Zavialov2021-02-051-2/+2
| | |\
| | | * Rename pprLogErrMsg to new nameAlfredo Di Napoli2021-02-011-2/+2
| | | |
| | * | type level characters support for haddock (required for #11342)Daniel Rogozin2021-02-053-0/+3
| | |/
| * | Fix partial record selector warningBen Gamari2021-02-061-3/+3
| | |
| * | Merge remote-tracking branch 'origin/ghc-head' into wip/ghc-head-mergeBen Gamari2021-02-068-418/+599
| |\|
| | * Merge pull request #1293 from obsidiansystems/wip/fix-18936Alan Zimmerman2021-01-231-0/+2
| | |\ | | | | | | | | Add `NoGhcTc` instance now that it's not closed
| | | * Add `NoGhcTc` instance now that it's not closedJohn Ericson2021-01-221-0/+2
| | | |
| | * | Make haddock more robust to changes to the `Language` data typeJoachim Breitner2021-01-221-4/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | With the introduction of GHC2021, the `Languages` data type in GHC will grow. In preparation of that (and to avoid changing haddock with each new language), this change makes the code handle extensions to that data type gracefully. (cherry picked from commit c341dd7c9c3fc5ebc83a2d577c5a726f3eb152a5)
| | * Merge pull request #1273 from hsyl20/wip/hsyl20/arrowsHécate Moonlight2021-01-143-3/+3
| | |\ | | | | | | | | Fix after binder collect changes
| | | * Fix after binder collect changesSylvain Henry2020-12-213-3/+3
| | | |
| | * | Abstract Monad for interface creationAlex Biehl2021-01-099-275/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found that when running as a plugin the lookupName function (which runs in Ghc monad) does not work correctly from the typeCheckResultAction hook. Instead, we abstracted the monad used when creating interfaces, so that access to GHC session specific parts is explicit and so that the TcM can provide their (correct) implementation of lookupName.
| | * | Add -j[n] CLI param to Haddock executableAlex Biehl2021-01-091-2/+7
| | | | | | | | | | | | | | | | It translates to `--ghcopt=-j[n]`