>
license: BSD-3-Clause
license-file: LICENSE
@@ -33,7 +35,7 @@
copyright: (c) Simon Marlow, David Waern
category: Documentation
build-type: Simple
-tested-with: GHC==9.2.*
+tested-with: GHC==9.4.*
extra-source-files:
CHANGES.md
@@ -66,7 +68,7 @@
-- haddock typically only supports a single GHC major version
build-depends:
- base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0
+ base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0 || ^>= 4.17.0.0
if flag(in-ghc-tree)
hs-source-dirs: haddock-api/src, haddock-library/src
@@ -81,7 +83,7 @@
xhtml >= 3000.2 && < 3000.3,
ghc-boot,
ghc-boot-th,
- ghc == 9.2.*,
+ ghc == 9.4.*,
bytestring,
parsec,
text,
@@ -111,6 +113,8 @@
Haddock.Parser
Haddock.Utils
Haddock.Utils.Json
+ Haddock.Utils.Json.Parser
+ Haddock.Utils.Json.Types
Haddock.Backends.Xhtml
Haddock.Backends.Xhtml.Decl
Haddock.Backends.Xhtml.DocMarkup
@@ -146,7 +150,7 @@
else
-- in order for haddock's advertised version number to have proper meaning,
-- we pin down to a single haddock-api version.
- build-depends: haddock-api == 2.26.0
+ build-depends: haddock-api == 2.27.0
test-suite html-test
type: exitcode-stdio-1.0
diff --git a/hoogle-test/ref/Bug873/test.txt b/hoogle-test/ref/Bug873/test.txt
deleted file mode 100644
--- a/hoogle-test/ref/Bug873/test.txt
+++ /dev/null
@@ -1,27 +0,0 @@
--- Hoogle documentation, generated by Haddock
--- See Hoogle, http://www.haskell.org/hoogle/
-
-@package test
-@version 0.0.0
-
-module Bug873
-
--- | Application operator. This operator is redundant, since ordinary
--- application (f x) means the same as (f $ x).
--- However, $ has low, right-associative binding precedence, so it
--- sometimes allows parentheses to be omitted; for example:
---
---
--- f $ g $ h x = f (g (h x))
---
---
--- It is also useful in higher-order situations, such as map
--- ($ 0) xs, or zipWith ($) fs xs.
---
--- Note that ($) is levity-polymorphic in its result
--- type, so that foo $ True where foo :: Bool ->
--- Int# is well-typed.
-($) :: forall (r :: RuntimeRep) a (b :: TYPE r). (a -> b) -> a -> b
-infixr 0 $
-($$) :: (a -> b) -> a -> b
-infixr 0 $$
diff --git a/hoogle-test/src/Bug806/Bug806.hs b/hoogle-test/src/Bug806/Bug806.hs
--- a/hoogle-test/src/Bug806/Bug806.hs
+++ b/hoogle-test/src/Bug806/Bug806.hs
@@ -1,5 +1,4 @@
{-# LANGUAGE Haskell2010 #-}
-{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE UndecidableInstances #-}
module Bug806 where
diff --git a/hoogle-test/src/Bug873/Bug873.hs b/hoogle-test/src/Bug873/Bug873.hs
deleted file mode 100644
--- a/hoogle-test/src/Bug873/Bug873.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-{-# LANGUAGE Haskell2010 #-}
-module Bug873 (($), ($$)) where
-infixr 0 $$
-
-($$) :: (a -> b) -> a -> b
-f $$ x = f x
diff --git a/html-test/ref/Bug1004.html b/html-test/ref/Bug1004.html
--- a/html-test/ref/Bug1004.html
+++ b/html-test/ref/Bug1004.html
@@ -1228,13 +1228,13 @@
> ( (Typeable a, a, Typeable f, f, Typeable g, g, Typeable k, DatadataCast1 :: :: Typeable t => (forall
dataCast2 :: :: Typeable t => (forall
Some text.
- Item 1
Item 2
Some code
- Item 3
Some text.
- Item 1
Item 2
Some code
- Item 3
Somthing with a spliced type
Something with a spliced type
length - 1length - 1Not bunded and no argument docs
Not bundled and no argument docs
:: forall a (b :: ()) d. d ~ ' a (b :: ()) d. d ~ '() | ++, elem, ++, elem, Unqualified: 1 `elem` [-3..3]Qualified: 1 `elem` [-3..3]Namespaced: `elem`, baz :: [c] -> (forall a. a -> a) -> (b, a1. a1 -> a1) -> (b, forall c0. c0 -> [c]) -> (b, c1) c1. c1 -> [c]) -> (b, c0) #baz' :: b -> (forall b. b -> [c]) -> ( b1. b1 -> [c]) -> (forall b. b -> [c]) -> [(b, [c])] b1. b1 -> [c]) -> [(b, [c])] # baz'' :: b -> (forall b. ( b1. (forall b. b -> [c]) -> c0) -> b2. b2 -> [c]) -> c0) -> forall c1. c1 -> b #baz :: (a -> b) -> (forall a0. a0 -> a0) -> (b0, a1. a1 -> a1) -> (b0, forall c. c -> a -> b) -> (b0, c) c1. c1 -> a -> b) -> (b0, c) # forall b1. b1 -> a -> b) -> (forall b2. b2 -> a -> b) -> [(b0, a -> b)] b1. b1 -> a -> b) -> [(b0, a -> b)] #forall b2. b2 -> a -> b) -> c) -> forall c. c -> b0 c1. c1 -> b0 # Quux a b c -> (forall a0. a0 -> a0) -> (b0, a1. a1 -> a1) -> (b0, forall c0. c0 -> c1. c1 -> Quux a b c) -> (b0, c1) a b c) -> (b0, c0) #Quux a b c) -> (forall b2. b2 -> b1. b1 -> Quux a b c) -> [(b0, Quuxbaz :: (a, b, c) -> (forall a0. a0 -> a0) -> (b0, a1. a1 -> a1) -> (b0, forall c0. c0 -> (a, b, c)) -> (b0, c1) c1. c1 -> (a, b, c)) -> (b0, c0) # forall b1. b1 -> (a, b, c)) -> (forall b2. b2 -> (a, b, c)) -> [(b0, (a, b, c))] b1. b1 -> (a, b, c)) -> [(b0, (a, b, c))] #baz :: (a, [b], b, a) -> (forall a0. a0 -> a0) -> (b0, a1. a1 -> a1) -> (b0, forall c. c -> (a, [b], b, a)) -> (b0, c) c1. c1 -> (a, [b], b, a)) -> (b0, c) # forall b1. b1 -> (a, [b], b, a)) -> (forall b2. b2 -> (a, [b], b, a)) -> [(b0, (a, [b], b, a))] b1. b1 -> (a, [b], b, a)) -> [(b0, (a, [b], b, a))] # forall b2. b2 -> (a, [b], b, a)) -> c) -> forall c. c -> b0 c1. c1 -> b0 # Quux a b c -> (forall a0. a0 -> a0) -> (b0, a1. a1 -> a1) -> (b0, forall c0. c0 -> c1. c1 -> Quux a b c) -> (b0, c1) a b c) -> (b0, c0) #Quux a b c) -> (forall b2. b2 -> b1. b1 -> Quux a b c) -> [(b0, Quux easily go back - some indentation
back at the top Even more content on a new line. Different type of list - Deeper
This is the next item (different kind of bullet) - This is an ordered list
- This is the next item (different kind of bullet)
f :: a ~ b => a -> b :: a ~ b => a -> b # g :: (a ~ b, b ~ c) => a -> c :: (a ~ b, b ~ c) => a -> c # $(let i = [t| Int |] in [t| $i -> $i |])
foo x y = x + y
diff --git a/html-test/src/BundledPatterns2.hs b/html-test/src/BundledPatterns2.hs
--- a/html-test/src/BundledPatterns2.hs
+++ b/html-test/src/BundledPatterns2.hs
@@ -1,6 +1,5 @@
{-# LANGUAGE Haskell2010 #-}
-{-# LANGUAGE DataKinds, GADTs, KindSignatures, PatternSynonyms, TypeOperators,
- ViewPatterns #-}
+{-# LANGUAGE DataKinds, GADTs, KindSignatures, PatternSynonyms #-}
module BundledPatterns2 (Vec((:>), Empty), RTree(..)) where
import GHC.TypeLits
diff --git a/html-test/src/ConstructorArgs.hs b/html-test/src/ConstructorArgs.hs
--- a/html-test/src/ConstructorArgs.hs
+++ b/html-test/src/ConstructorArgs.hs
@@ -50,7 +50,7 @@
-> Boo -- ^ a 'Boo' pattern
pattern Bo x y = Foo x y
--- | Not bunded and no argument docs
+-- | Not bundled and no argument docs
pattern Bo' :: Int -> String -> Boo
pattern Bo' x y = Foo x y
diff --git a/html-test/src/DefaultAssociatedTypes.hs b/html-test/src/DefaultAssociatedTypes.hs
--- a/html-test/src/DefaultAssociatedTypes.hs
+++ b/html-test/src/DefaultAssociatedTypes.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE Haskell2010 #-}
-{-# LANGUAGE DefaultSignatures, TypeFamilies #-}
+{-# LANGUAGE TypeFamilies #-}
module DefaultAssociatedTypes where
diff --git a/html-test/src/GadtConstructorArgs.hs b/html-test/src/GadtConstructorArgs.hs
--- a/html-test/src/GadtConstructorArgs.hs
+++ b/html-test/src/GadtConstructorArgs.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE Haskell2010 #-}
-{-# LANGUAGE GADTs, PatternSynonyms #-}
+{-# LANGUAGE GADTs #-}
module GadtConstructorArgs (Boo(..)) where
diff --git a/html-test/src/Operators.hs b/html-test/src/Operators.hs
--- a/html-test/src/Operators.hs
+++ b/html-test/src/Operators.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE Haskell2010 #-}
-{-# LANGUAGE PatternSynonyms, TypeOperators, TypeFamilies, MultiParamTypeClasses, GADTs #-}
+{-# LANGUAGE PatternSynonyms, TypeOperators, TypeFamilies, GADTs #-}
{-# LANGUAGE FunctionalDependencies #-}
-- | Test operators with or without fixity declarations
diff --git a/html-test/src/QuasiQuote.hs b/html-test/src/QuasiQuote.hs
--- a/html-test/src/QuasiQuote.hs
+++ b/html-test/src/QuasiQuote.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE Haskell2010 #-}
-{-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
+{-# LANGUAGE QuasiQuotes #-}
-- example taken from the GHC documentation
module QuasiQuote where
diff --git a/hypsrc-test/Main.hs b/hypsrc-test/Main.hs
--- a/hypsrc-test/Main.hs
+++ b/hypsrc-test/Main.hs
@@ -2,7 +2,7 @@
import Data.Char
-import Data.List
+import Data.List (isPrefixOf)
import Data.Function (on)
import System.Environment
diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html
--- a/hypsrc-test/ref/src/Classes.html
+++ b/hypsrc-test/ref/src/Classes.html
@@ -194,7 +194,7 @@
>bar :: Int -> Int
barbaz :: Int -> (Int, Int)
bazbar :: [a] -> Int
bar[a] -> Int
+forall a. [a] -> Int
forall (t :: * -> *) a. Foldable t => t a -> Int
baz :: Int -> ([a], [a])
baz[Int] -> Int
+forall a. Num a => [a] -> a
forall (t :: * -> *) a. (Foldable t, Num a) => t a -> a
norf :: [Int] -> Int
norf[Int] -> Int
+forall a. Num a => [a] -> a
forall (t :: * -> *) a. (Foldable t, Num a) => t a -> a
quux :: ([a], [a]) -> [a]
quuxplugh :: forall a b. Either a a -> Either b b -> Either (a -> b) (b -> a)
plugh[Int] -> Int
+forall a. Num a => [a] -> a
forall (t :: * -> *) a. (Foldable t, Num a) => t a -> a
-- Tests that the identifiers/operators are properly linked even when:
-
-
((a, b) -> c -> (a, b)) -> (a, b) -> c -> (a, b)
-forall a b. (a -> b) -> a -> b
-$ (
|