Skip to content

Commit d35af1c

Browse files
committed
restore compat. with haddock-library 1.8
1 parent b085e7a commit d35af1c

11 files changed

+7
-11
lines changed

ghcide/ghcide.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 2.4
22
build-type: Simple
33
category: Development
44
name: ghcide
5-
version: 1.2.0.0
5+
version: 1.2.0.1
66
license: Apache-2.0
77
license-file: LICENSE
88
author: Digital Asset and Ghcide contributors
@@ -54,7 +54,7 @@ library
5454
ghc-exactprint,
5555
ghc-trace-events,
5656
Glob,
57-
haddock-library ^>= 1.10.0,
57+
haddock-library >= 1.8 && < 1.11,
5858
hashable,
5959
hie-compat ^>= 0.1.0.0,
6060
hls-plugin-api ^>= 1.1.0.0,

ghcide/src/Development/IDE/Spans/Common.hs

+5
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ haddockToMarkdown (H.DocIdentifier i)
121121
= "`" ++ i ++ "`"
122122
haddockToMarkdown (H.DocIdentifierUnchecked i)
123123
= "`" ++ i ++ "`"
124+
#if MIN_VERSION_haddock_library(1,10,0)
124125
haddockToMarkdown (H.DocModule (H.ModLink i Nothing))
125126
= "`" ++ escapeBackticks i ++ "`"
126127
-- See https://github.com/haskell/haddock/pull/1315
@@ -130,6 +131,10 @@ haddockToMarkdown (H.DocModule (H.ModLink i Nothing))
130131
-- some label ( `Some.Module` )
131132
haddockToMarkdown (H.DocModule (H.ModLink i (Just label)))
132133
= haddockToMarkdown label ++ " ( `" ++ escapeBackticks i ++ "` )"
134+
#else
135+
haddockToMarkdown (H.DocModule i)
136+
= "`" ++ escapeBackticks i ++ "`"
137+
#endif
133138
haddockToMarkdown (H.DocWarning w)
134139
= haddockToMarkdown w
135140
haddockToMarkdown (H.DocEmphasis d)

stack-8.10.2.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ extra-deps:
3535
- lsp-1.2.0.0
3636
- lsp-types-1.2.0.0
3737
- lsp-test-0.14.0.0
38-
- haddock-library-1.10.0
3938
- heapsize-0.3.0
4039
- hie-bios-0.7.4
4140
- implicit-hie-cradle-0.3.0.2

stack-8.10.3.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ extra-deps:
3030
- fourmolu-0.3.0.0
3131
- ghc-lib-8.10.4.20210206
3232
- ghc-lib-parser-8.10.4.20210206
33-
- haddock-library-1.10.0
3433
- heapsize-0.3.0
3534
- hie-bios-0.7.4
3635
- implicit-hie-cradle-0.3.0.2

stack-8.10.4.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ extra-deps:
2828
- data-tree-print-0.1.0.2@rev:2
2929
- floskell-0.10.4
3030
- fourmolu-0.3.0.0
31-
- haddock-library-1.10.0
3231
- heapsize-0.3.0
3332
- hie-bios-0.7.4
3433
- implicit-hie-cradle-0.3.0.2

stack-8.6.4.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ extra-deps:
4545
- ghc-source-gen-0.4.0.0
4646
- ghc-trace-events-0.1.2.1
4747
- haddock-api-2.22.0@rev:1
48-
- haddock-library-1.10.0
4948
- hashable-1.3.0.0
5049
- heapsize-0.3.0
5150
- hie-bios-0.7.4

stack-8.6.5.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ extra-deps:
4444
- ghc-source-gen-0.4.0.0
4545
- ghc-trace-events-0.1.2.1
4646
- haddock-api-2.22.0@rev:1
47-
- haddock-library-1.10.0
4847
- hashable-1.3.0.0
4948
- heapsize-0.3.0
5049
- hie-bios-0.7.4

stack-8.8.2.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ extra-deps:
3838
- ghc-lib-parser-8.10.4.20210206
3939
- ghc-lib-parser-ex-8.10.0.17
4040
- ghc-trace-events-0.1.2.1
41-
- haddock-library-1.10.0
4241
- haskell-src-exts-1.21.1
4342
- heapsize-0.3.0
4443
- hie-bios-0.7.4

stack-8.8.3.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ extra-deps:
3636
- ghc-lib-parser-8.10.4.20210206
3737
- ghc-trace-events-0.1.2.1
3838
- haskell-src-exts-1.21.1
39-
- haddock-library-1.10.0
4039
- heapsize-0.3.0
4140
- hie-bios-0.7.4
4241
- hlint-3.2.3

stack-8.8.4.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ extra-deps:
3636
- ghc-lib-parser-8.10.4.20210206
3737
- ghc-trace-events-0.1.2.1
3838
- haskell-src-exts-1.21.1
39-
- haddock-library-1.10.0
4039
- heapsize-0.3.0
4140
- hie-bios-0.7.4
4241
- hlint-3.2.3

stack.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ extra-deps:
4646
- ghc-source-gen-0.4.0.0
4747
- ghc-trace-events-0.1.2.1
4848
- haddock-api-2.22.0@rev:1
49-
- haddock-library-1.10.0
5049
- hashable-1.3.0.0
5150
- heapsize-0.3.0
5251
- hie-bios-0.7.4

0 commit comments

Comments
 (0)