aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock/GhcUtils.hs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/ghc-9.4'Ben Gamari2022-08-051-18/+16
|\
| * Keep track of promotion ticks in HsOpTysheaf2022-04-011-3/+3
| | | | | | | | | | Keeping track of promotion ticks in HsOpTy allows us to properly pretty-print promoted constructors such as lists.
| * Minimum changes needed for compilation with hi-haddockMatthew Pickering2022-03-221-2/+2
| | | | | | | | | | | | 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-141-0/+1
| |
| * Update after NoExtCon -> DataConCantHappen renameKrzysztof Gogolewski2021-11-271-1/+1
| |
| * HsToken in FunTy, RecConGADTVladislav Zavialov2021-06-101-3/+3
| |
| * FieldOcc: rename extFieldOcc to foExtShayne Fletcher2021-05-221-2/+2
| |
| * Remove Maybe from HsQualTyAlan Zimmerman2021-05-201-7/+4
| | | | | | | | Match changes in GHC for #19845
| * Update for EPA changes in GHCAlan Zimmerman2021-05-111-3/+3
| |
| * Revert "Removal of HsVersions.h (#1388)"Hécate Moonlight2021-05-111-3/+3
| | | | | | | | This reverts commit 72118896464f94d81f10c52f5d9261efcacc57a6.
| * Removal of HsVersions.h (#1388)Sylvain Henry2021-05-111-3/+3
| | | | | | | | | | | | | | * Update for EPA changes in GHC * Account for HsVersions.h removal Co-authored-by: Alan Zimmerman <alan.zimm@gmail.com>
| * EPA : Rename ApiAnn to EpAnnAlan Zimmerman2021-03-291-3/+3
| |
* | Follow hlint suggestion: redundant $. (#1505)Phil de Joux2022-07-241-1/+1
| | | | | | | | | | * Follow hlint suggestion: redundant $. * Remove $ and surplus blank lines in Operators.
* | Follow hlint, remove language pragmas in libs. (#1478)Phil de Joux2022-05-031-1/+1
| |
* | Follow hlint suggestion to remove redundant bang. (#1479)Phil de Joux2022-05-031-1/+1
| |
* | typos (#1464)askeblad2022-03-161-1/+1
| |
* | Update for EPA changes in GHCAlan Zimmerman2021-04-191-3/+3
| | | | | | | | (cherry picked from commit cafb48118f7c111020663776845897e225607b41)
* | EPA : Rename ApiAnn to EpAnnAlan Zimmerman2021-03-291-3/+3
|/
* Match changes in GHC AST for in-tree API AnnotationsAlan Zimmerman2021-03-151-46/+38
| | | | As landed via https://gitlab.haskell.org/ghc/ghc/-/merge_requests/2418
* Update for boxed repAndrew Martin2021-03-071-2/+2
|
* Context becomes a Maybe in the GHC ASTAlan Zimmerman2021-02-221-5/+11
| | | | | | This prevents noLoc's appearing in the ParsedSource. Match the change in GHC.
* Merge remote-tracking branch 'origin/ghc-head' into wip/ghc-head-mergeBen Gamari2021-02-061-10/+1
|\
| * Merge pull request #1273 from hsyl20/wip/hsyl20/arrowsHécate Moonlight2021-01-141-1/+1
| |\ | | | | | | Fix after binder collect changes
| | * Fix after binder collect changesSylvain Henry2020-12-211-1/+1
| | |
| * | Abstract Monad for interface creationAlex Biehl2021-01-091-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge remote-tracking branch 'origin/ghc-9.0' into ghc-headBen Gamari2021-01-131-23/+145
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/ghc-8.10' into ghc-9.0Ben Gamari2021-01-051-24/+125
| |\ \
| | * | Changes for GHC#17566Alex Biehl2020-12-081-3/+26
| | | | | | | | | | | | | | | | See https://gitlab.haskell.org/ghc/ghc/merge_requests/2469
| | * | 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
| | * | Use `unLoc`/`noLoc` from GHC instead of `unL`/`reL`Alec Theriault2020-03-281-33/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `unL` is already defined by GHC as `unLoc` * `reL` is already defined by GHC as `noLoc` (in a safer way too!) * Condense `setOutputDir` and add a about exporting from GHC Fixes #978
| | * | Use TTG empty extensions to remove some `error`'sAlec Theriault2020-03-281-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of these error cases should ever have been reachable, so this is just a matter of leveraging the type system to assert this. * Use the `NoExtCon` and `noExtCon` to handle case matches for no extension constructors, instead of throwing an `error`. * Use the extension field of `HsSpliceTy` to ensure that this variant of `HsType` cannot exist in an `HsType DocNameI`.
| | * | Remove unused `Haddock.Utils` functionsAlec Theriault2020-03-281-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed functions in `Haddock.Utils` that were not used anywhere (or exported from the `haddock-api` package) * moved GHC-specific utils from `Haddock.Utils` to `Haddock.GhcUtils`
| | * | Merge branch 'ghc-8.8' into ghc-8.10Alec Theriault2020-03-201-4/+10
| | |\ \
| | | * | Fix #1063 with better parenthesization logic for contextsAlec Theriault2019-05-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only other change in html/hoogle/hyperlinker output for the boot libraries that this caused is a fix to some Hoogle output for implicit params. ``` $ diff -r _build/docs/ old_docs diff -r _build/docs/html/libraries/base/base.txt old_docs/html/libraries/base/base.txt 13296c13296 < assertError :: (?callStack :: CallStack) => Bool -> a -> a --- > assertError :: ?callStack :: CallStack => Bool -> a -> a ```
| | | * | Merge branch 'ghc-8.6' into ghc-8.8Alec Theriault2019-03-031-1/+4
| | | |\ \
| | | | * | Update the ghc-8.6 branch (#889)Simon Jakobi2018-07-201-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Bump GHC version to 8.6" This was applied to the wrong branch; there's now a `ghc-8.6` branch; ghc-head is always supposed to point to GHC HEAD, i.e. an odd major version. The next version bump to `ghc-head` is supposed to go from e.g. 8.5 to 8.7 This reverts commit 5e3cf5d8868323079ff5494a8225b0467404a5d1. * README updates (#856) * README: Remove mentions of master branch * README: Add instructions for using html-test * README: Change command to run _all_ the testsuites * README: Add project overview section (cherry picked from commit 61d6f935da97eb96685f07bf385102c2dbc2a33c) * Export more fixities for Hoogle (#871) This exports fixities for more things, including class methods and type-level operators. (cherry picked from commit 88316b972e3d47197b1019111bae0f7f87275fce) * Avoid line breaks due to line length in Hoogle (#868) * Avoid line breaks due to line length in Hoogle Hoogle operates in a line-oriented fashion, so we should avoid ever breaking due to long lines. One way of doing this non-intrusively is to modify the 'DynFlags' that are threaded through the 'Hoogle' module (note this is anyways only passed through for use in the various 'showSDoc' functions). * Amend test case (cherry picked from commit 657b1b3d519545f8d4ca048c06210d6cbf0f0da0) * tyThingToLHsDecl: Preserve type synonyms that contain a forall (#880) * tyThingToLHsDecls: Preserve type synonyms that contain a forall Fixes #879. * Add Note [Invariant: Never expand type synonyms] * Clarify Note [Invariant: Never expand type synonyms] (cherry picked from commit c3eb3f0581f69e816f9453b1747a9f2a3ba02bb9) * Fix HEAD html-test (#860) * Update tests for 'StarIsType' * Accept tests * Revert "Update tests for 'StarIsType'" This reverts commit 7f0c01383bbba6dc5af554ee82988d2cf44e407a. * Refactor handling of parens in types (#874) * Fix type parenthesization in Hoogle backend Ported the logic in the HTML and LaTeX backends for adding in parens into something top-level in 'GhcUtil'. Calling that from the Hoogle backend fixes #873. * Remove parenthesizing logic from LaTeX and XHTML backends Now, the only times that parenthesis in types are added in any backend is through the explicit 'HsParTy' constructor. Precedence is also represented as its own datatype. * List out cases explicitly vs. catch-all * Fix printing of parens for QuantifiedConstraints The priority of printing 'forall' types was just one too high. Fixes #877. * Accept HTML output for quantified contexts test * Preserve docs on type family instances (#867) * Preserve docs on type family instances The only problem was that the instance location was slightly off for type family instances. * Accept output (cherry picked from commit 133e9c2c168db19c1135479f7ab144c4e33af2a4) * Fix broken instance source links (#869) The problem manifests itself in instances that are defined in modules other than the module where the class is defined. The fix is just to thread through the 'Module' of the instance further along. Since orphan instances appear to already have been working, I didn't do anything there. (cherry picked from commit 2de7c2acf9b1ec85b09027a8bb58bf8512e91c05) * Add some more unicode related tests (#872) This has been fixed for sure ever since we switched from attoparsec to parsec. Parts of it may have been working before that, but there was a point where this would have failed (see #191). A regression test never hurt anyone. :) (cherry picked from commit 5ec7715d418bfac0f26aec6039792a99a6e89370) * Misc tests (#858) * More tests * spliced types * constructor/pattern argument docs * strictness marks on fields with argument docs * latex test cases need seperate directory * Accept tests * Additional tests for the identifier parser (#816) * Add tests for the identifier parser * docs: Clarify how to delimit identifiers (cherry picked from commit 0861affeca4d72938f05a2eceddfae2c19199071)
| * | | | | Match GHC, adding IsUnicodeSyntax field to HsFunTy and HsScaledAlan Zimmerman2020-10-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a7d1d8e034d25612d5d08ed8fdbf6f472aded4a1)
* | | | | | Inline and fix getGADTConTypeGVladislav Zavialov2020-12-291-30/+0
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getGADTConTypeG used HsRecTy, which is at odds with GHC issue #18782. I noticed that getGADTConTypeG was only used in the Hoogle backend. Interestingly, when handling H98 constructors, Hoogle converts RecCon to PrefixCon (see Haddock.Backends.Hoogle.ppCtor). So I changed getGADTConTypeG to handle RecConGADT in the same manner as PrefixConGADT, and after this simplification moved it into the 'where' clause of ppCtor, to the only place where it is used. The practical effect of this change is as follows. Consider this example: data TestH98 = T98 { bar::Int } data TestGADT where TG :: { foo :: Int } -> TestGADT Before this patch, haddock --hoogle used to produce: T98 :: Int -> TestH98 [TG] :: {foo :: Int} -> TestGADT Notice how the record syntax was discarded in T98 but not TG. With this patch, we always produce signatures without record syntax: T98 :: Int -> TestH98 [TG] :: Int -> TestGADT I suspect this might also be a bugfix, as currently Hoogle doesn't seem to render GADT record constructors properly.
* | | | | 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
* | | | | Merge remote-tracking branch 'upstream/ghc-head' into ghc-headBen Gamari2020-12-151-1/+0
|\ \ \ \ \
| * | | | | Revert "Enable two warnings (#1245) (#1268)"Ben Gamari2020-12-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this does not build on GHC `master`. This reverts commit 7936692badfe38f23ae95b51fb7bd7c2ff7e9bce.
* | | | | | Revert "Update for boxed rep"Ben Gamari2020-12-151-2/+2
|/ / / / / | | | | | | | | | | | | | | | This reverts commit 4ffb30d8b637ccebecc81ce610f0af451ac8088d.
* | | | | Update for boxed repAndrew Martin2020-12-141-2/+2
| | | | |
* | | | | 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
* | | | | Adapt to HsOuterTyVarBndrsRyan Scott2020-10-301-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | These changes accompany ghc/ghc!4107, which aims to be a fix for #16762.
* | | | | Adapt to HsConDecl{H98,GADT}Details splitRyan Scott2020-10-301-11/+6
| | | | | | | | | | | | | | | | | | | | Needed for GHC#18844.
* | | | | GHC.Driver.Types refactoring (#1242)Sylvain Henry2020-10-261-1/+0
| | | | |
* | | | | Match GHC, adding IsUnicodeSyntax field to HsFunTy and HsScaledAlan Zimmerman2020-10-191-3/+4
| | | | |
* | | | | Fix after Outputable refactoringSylvain Henry2020-08-051-1/+3
| | | | |
* | | | | Update for modular ping pongZubin Duggal2020-07-231-37/+25
|/ / / /