aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYuchen Pei <hi@ypei.me>2022-06-06 18:30:40 +1000
committerYuchen Pei <hi@ypei.me>2022-06-06 18:30:40 +1000
commit93825d12f0e3c97a5db4a48b4fe6ae4865256a67 (patch)
tree4f0d6aaceae23d91d6b96f35f2b44d278166ada2 /src
parentb69b74c577f3b1aeb1f2722f53d037d6a21d1abc (diff)
fixing selectorDocs
Diffstat (limited to 'src')
-rw-r--r--src/HaskellCodeExplorer/GhcUtils.hs43
-rw-r--r--src/HaskellCodeExplorer/PackageInfo.hs45
2 files changed, 44 insertions, 44 deletions
diff --git a/src/HaskellCodeExplorer/GhcUtils.hs b/src/HaskellCodeExplorer/GhcUtils.hs
index a1b121c..0a106ad 100644
--- a/src/HaskellCodeExplorer/GhcUtils.hs
+++ b/src/HaskellCodeExplorer/GhcUtils.hs
@@ -99,6 +99,10 @@ import GHC.Data.FastString
)
import GHC
( DynFlags
+ , XRec
+ , getRecConArgs_maybe
+ , ConDeclField(..)
+ , LConDeclField
, CollectFlag(..)
, LHsBindLR
, reLocN
@@ -1043,6 +1047,7 @@ tyVarsOfType = varSetElems . everything unionVarSet (emptyVarSet `mkQ` tyVar)
-- #endif
-- also available in GHC.HsToCore.Docs
+-- Take a field of declarations from a data structure and create HsDecls using the given constructor
-- mkDecls :: (struct -> [GenLocated l decl]) -> (decl -> hsDecl) -> struct -> [GenLocated l hsDecl]
-- mkDecls :: (a -> [Located b]) -> (b -> c) -> a -> [Located c]
-- mkDecls field con struct = [L loc (con decl) | L loc decl <- field struct]
@@ -1091,37 +1096,31 @@ conDeclDocs conDecl =
getConNames $
conDecl
--- no longer used by subordinateNamesWithDocs
--- extractRecCon :: ConDecl p -> Maybe (XRec p [LConDeclField p])
--- extractRecCon = undefined
-
--- no longer used by subordinateNamesWithDocs
--- selectorDocs :: ConDecl GhcRn -> [(Name, [HsDocString], SrcSpan)]
--- selectorDocs con =
--- case extractRecCon con of
--- Just (L _ flds) ->
--- concatMap
--- (\(L _ (ConDeclField _ fieldOccs _ mbDoc)) ->
--- map
--- (\(L span f) ->
--- (extFieldOcc f, maybe [] ((: []) . unLoc) mbDoc, span))
--- fieldOccs)
--- flds
--- _ -> []
+selectorDocs :: ConDecl GhcRn -> [(Name, [HsDocString], SrcSpan)]
+selectorDocs con =
+ case getRecConArgs_maybe con of
+ Just (L _ flds) ->
+ concatMap
+ (\(L _ (ConDeclField _ fieldOccs _ mbDoc)) ->
+ map
+ (\(L span f) ->
+ (extFieldOcc f, maybe [] ((: []) . unLoc) mbDoc, span))
+ fieldOccs)
+ flds
+ _ -> []
subordinateNamesWithDocs :: [LHsDecl GhcRn] -> [(Name, [HsDocString], SrcSpan)]
subordinateNamesWithDocs =
concatMap
(\lhd ->
case unLoc lhd of
- TyClD _ classDecl ->
+ TyClD _ classDecl@ClassDecl {} ->
concatMap
(\(L _ decl, docs) -> map (, docs, getLocA lhd) $ getMainDeclBinder decl) $
classDeclDocs classDecl
- -- Pattern match is redundant
- -- TyClD _ DataDecl {..} ->
- -- concatMap (\(L _ con) -> conDeclDocs con ++ selectorDocs con) $
- -- dd_cons tcdDataDefn
+ TyClD _ DataDecl {..} ->
+ concatMap (\(L _ con) -> conDeclDocs con ++ selectorDocs con) $
+ dd_cons tcdDataDefn
InstD _ (DataFamInstD _ DataFamInstDecl {..}) ->
concatMap (conDeclDocs . unLoc) . dd_cons . feqn_rhs $ dfid_eqn
_ -> [])
diff --git a/src/HaskellCodeExplorer/PackageInfo.hs b/src/HaskellCodeExplorer/PackageInfo.hs
index 0800382..b31be70 100644
--- a/src/HaskellCodeExplorer/PackageInfo.hs
+++ b/src/HaskellCodeExplorer/PackageInfo.hs
@@ -300,29 +300,30 @@ createPackageInfo packageDirectoryPath mbDistDirRelativePath sourceCodePreproces
chComponentNameToComponentId ChSetupHsName = HCE.ComponentId "setup"
-
-#if MIN_VERSION_GLASGOW_HASKELL(8,6,5,0)
-ghcVersion :: Version
-ghcVersion = makeVersion [8, 6, 5, 0]
-#elif MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
-ghcVersion :: Version
-ghcVersion = makeVersion [8, 6, 4, 0]
-#elif MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)
-ghcVersion :: Version
-ghcVersion = makeVersion [8, 6, 3, 0]
-#elif MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)
-ghcVersion :: Version
-ghcVersion = makeVersion [8, 4, 4, 0]
-#elif MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)
-ghcVersion :: Version
-ghcVersion = makeVersion [8, 4, 3, 0]
-#elif MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)
-ghcVersion :: Version
-ghcVersion = makeVersion [8, 2, 2, 0]
-#else
ghcVersion :: Version
-ghcVersion = makeVersion [8, 0, 2, 0]
-#endif
+ghcVersion = makeVersion [9, 2, 2, 0]
+-- #if MIN_VERSION_GLASGOW_HASKELL(8,6,5,0)
+-- ghcVersion :: Version
+-- ghcVersion = makeVersion [8, 6, 5, 0]
+-- #elif MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
+-- ghcVersion :: Version
+-- ghcVersion = makeVersion [8, 6, 4, 0]
+-- #elif MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)
+-- ghcVersion :: Version
+-- ghcVersion = makeVersion [8, 6, 3, 0]
+-- #elif MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)
+-- ghcVersion :: Version
+-- ghcVersion = makeVersion [8, 4, 4, 0]
+-- #elif MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)
+-- ghcVersion :: Version
+-- ghcVersion = makeVersion [8, 4, 3, 0]
+-- #elif MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)
+-- ghcVersion :: Version
+-- ghcVersion = makeVersion [8, 2, 2, 0]
+-- #else
+-- ghcVersion :: Version
+-- ghcVersion = makeVersion [8, 0, 2, 0]
+-- #endif
buildDirectoryTree :: FilePath -> [FilePath] -> (FilePath -> Bool) -> IO HCE.DirTree
buildDirectoryTree path ignoreDirectories isHaskellModule = do