restore compat. with haddock-library 1.8

haskell · Apr 12, 2021 · 8d4d63d · 8d4d63d
1 parent b085e7a
commit 8d4d63d
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -2,7 +2,7 @@ cabal-version:      2.4
 build-type:         Simple
 category:           Development
 name:               ghcide
-version:            1.2.0.0
+version:            1.2.0.1
 license:            Apache-2.0
 license-file:       LICENSE
 author:             Digital Asset and Ghcide contributors
@@ -54,7 +54,7 @@ library
         ghc-exactprint,
         ghc-trace-events,
         Glob,
-        haddock-library ^>= 1.10.0,
+        haddock-library >= 1.8 && < 1.11,
         hashable,
         hie-compat ^>= 0.1.0.0,
         hls-plugin-api ^>= 1.1.0.0,

diff --git a/ghcide/src/Development/IDE/Spans/Common.hs b/ghcide/src/Development/IDE/Spans/Common.hs
@@ -121,6 +121,7 @@ haddockToMarkdown (H.DocIdentifier i)
   = "`" ++ i ++ "`"
 haddockToMarkdown (H.DocIdentifierUnchecked i)
   = "`" ++ i ++ "`"
+#if MIN_VERSION_haddock_library(1,10,0)
 haddockToMarkdown (H.DocModule (H.ModLink i Nothing))
   = "`" ++ escapeBackticks i ++ "`"
 -- See https://github.com/haskell/haddock/pull/1315
@@ -130,6 +131,10 @@ haddockToMarkdown (H.DocModule (H.ModLink i Nothing))
 -- some label ( `Some.Module` )
 haddockToMarkdown (H.DocModule (H.ModLink i (Just label)))
   = haddockToMarkdown label ++ " ( `" ++ escapeBackticks i ++ "` )"
+#else
+haddockToMarkdown (H.DocModule i)
+  = "`" ++ escapeBackticks i ++ "`"
+#endif
 haddockToMarkdown (H.DocWarning w)
   = haddockToMarkdown w
 haddockToMarkdown (H.DocEmphasis d)

diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
@@ -35,7 +35,6 @@ extra-deps:
   - lsp-1.2.0.0
   - lsp-types-1.2.0.0
   - lsp-test-0.14.0.0
-  - haddock-library-1.10.0
   - heapsize-0.3.0
   - hie-bios-0.7.4
   - implicit-hie-cradle-0.3.0.2

diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
@@ -30,7 +30,6 @@ extra-deps:
   - fourmolu-0.3.0.0
   - ghc-lib-8.10.4.20210206
   - ghc-lib-parser-8.10.4.20210206
-  - haddock-library-1.10.0
   - heapsize-0.3.0
   - hie-bios-0.7.4
   - implicit-hie-cradle-0.3.0.2

diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml
@@ -28,7 +28,6 @@ extra-deps:
   - data-tree-print-0.1.0.2@rev:2
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - haddock-library-1.10.0
   - heapsize-0.3.0
   - hie-bios-0.7.4
   - implicit-hie-cradle-0.3.0.2

diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -36,7 +36,6 @@ extra-deps:
   - ghc-lib-parser-8.10.4.20210206
   - ghc-trace-events-0.1.2.1
   - haskell-src-exts-1.21.1
-  - haddock-library-1.10.0
   - heapsize-0.3.0
   - hie-bios-0.7.4
   - hlint-3.2.3

diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -36,7 +36,6 @@ extra-deps:
   - ghc-lib-parser-8.10.4.20210206
   - ghc-trace-events-0.1.2.1
   - haskell-src-exts-1.21.1
-  - haddock-library-1.10.0
   - heapsize-0.3.0
   - hie-bios-0.7.4
   - hlint-3.2.3

diff --git a/stack.yaml b/stack.yaml
@@ -46,7 +46,6 @@ extra-deps:
   - ghc-source-gen-0.4.0.0
   - ghc-trace-events-0.1.2.1
   - haddock-api-2.22.0@rev:1
-  - haddock-library-1.10.0
   - hashable-1.3.0.0
   - heapsize-0.3.0
   - hie-bios-0.7.4