From 4682ddb887d97ac2fb85c8b5842fd4021d374b0d Mon Sep 17 00:00:00 2001
From: Yuchen Pei <hi@ypei.me>
Date: Wed, 14 Sep 2022 17:52:19 +1000
Subject: changing to multiple files model

all files under the same dir
---
 haddock-api/src/Haddock/Backends/Org.hs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'haddock-api')

diff --git a/haddock-api/src/Haddock/Backends/Org.hs b/haddock-api/src/Haddock/Backends/Org.hs
index 2f6ff7cf..fa897ab0 100644
--- a/haddock-api/src/Haddock/Backends/Org.hs
+++ b/haddock-api/src/Haddock/Backends/Org.hs
@@ -113,7 +113,6 @@ import           GHC.Unit.Types                 ( GenModule(..)
 import           GHC.Utils.Outputable           ( showPprUnsafe )
 import qualified GHC.Utils.Ppr                 as Pretty
 import           GHC.Utils.Ppr                  ( (<+>)
-                                                , (<>)
                                                 , comma
                                                 , hsep
                                                 , punctuate
@@ -469,20 +468,20 @@ parensIfMany xs org = if length xs > 1 then orgParens org else org
 valOrTyp :: HasOccName n => n -> String
 valOrTyp name = if isValOcc (occName name) then "v" else "t"
 
-idPath :: ModPath -> DocName -> String
-idPath (pkg, mdl) name =
-  intercalate idPathSep [pkg, mdl, valOrTyp name, docNameToString name]
-
-idPath' :: Module -> DocName -> String
-idPath' mdl name =
-  idPath (cleanPkgStr $ unitString $ moduleUnit mdl, moduleString mdl) name
+idPathTarget :: Module -> DocName -> String
+idPathTarget mdl name =
+  "file:"
+    ++ (cleanPkgStr $ unitString $ moduleUnit mdl)
+    ++ ".org::#"
+    ++ intercalate idPathSep
+                   [moduleString mdl, valOrTyp name, docNameToString name]
 
 idPathNoPkg :: HasOccName n => String -> n -> String
 idPathNoPkg mdl name =
   intercalate idPathSep [mdl, valOrTyp name, occNameString (occName name)]
 
 cIdPaths :: ModPath -> DocName -> Properties
-cIdPaths path@(_, mdl) name = cIdsProp [idPath path name, idPathNoPkg mdl name]
+cIdPaths (_, mdl) name = cIdsProp [idPathNoPkg mdl name]
 
 ppTyClDecl
   :: TyClDecl DocNameI
@@ -945,7 +944,7 @@ ppPromoted flag = case flag of
 
 ppDocName :: DocName -> [OrgInline]
 ppDocName docName@(Documented _ mdl) =
-  [Link (text "#" <> text (idPath' mdl docName)) [Plain $ docNameToDoc docName]]
+  [Link (text (idPathTarget mdl docName)) [Plain $ docNameToDoc docName]]
 ppDocName docName@(Undocumented name) = case nameModule_maybe name of
   Nothing  -> [Plain $ docNameToDoc docName]
   Just mdl -> ppDocName (Documented name mdl)
-- 
cgit v1.2.3