export map improvements

Author: wz1000

ghcide/src/Development/IDE/Types/Exports.hs

@@ -8,6 +8,7 @@ module Development.IDE.Types.Exports
     rendered,
     moduleNameText,
     occNameText,
+    isDatacon,
     createExportsMap,
     createExportsMapMg,
     createExportsMapTc,
@@ -87,40 +88,41 @@ moduleNameText' = decodeUtf8 . bytesFS . moduleNameFS
 data IdentInfo = IdentInfo
     { name            :: !OccName
     , parent          :: !(Maybe OccName)
-    , isDatacon       :: !Bool
     , identModuleName :: !ModuleName
     }
     deriving (Generic, Show)
     deriving anyclass Hashable
 
+isDatacon :: IdentInfo -> Bool
+isDatacon = isDataOcc . name
+
 instance Eq IdentInfo where
     a == b = name a == name b
           && parent a == parent b
-          && isDatacon a == isDatacon b
-          && moduleNameText a == moduleNameText b
+          && identModuleName a == identModuleName b
 
 instance NFData IdentInfo where
     rnf IdentInfo{..} =
         -- deliberately skip the rendered field
-        rnf name `seq` rnf parent `seq` rnf isDatacon `seq` rnf moduleNameText
+        rnf name `seq` rnf parent `seq` rnf identModuleName
 
 mkIdentInfos :: ModuleName -> AvailInfo -> [IdentInfo]
 mkIdentInfos mod (AvailName n) =
-    [IdentInfo (nameOccName n) Nothing (isDataConName n) mod]
+    [IdentInfo (nameOccName n) Nothing mod]
 mkIdentInfos mod (AvailFL fl) =
-    [IdentInfo (nameOccName n) Nothing (isDataConName n) mod]
+    [IdentInfo (nameOccName n) Nothing mod]
     where
       n = flSelector fl
 mkIdentInfos mod (AvailTC parent (n:nn) flds)
     -- Following the GHC convention that parent == n if parent is exported
     | n == parent
-    = [ IdentInfo (nameOccName n) (Just $! nameOccName parent) (isDataConName n) mod
+    = [ IdentInfo (nameOccName n) (Just $! nameOccName parent) mod
         | n <- nn ++ map flSelector flds
       ] ++
-      [ IdentInfo (nameOccName n) Nothing (isDataConName n) mod]
+      [ IdentInfo (nameOccName n) Nothing mod]
 
 mkIdentInfos mod (AvailTC _ nn flds)
-    = [ IdentInfo (nameOccName n) Nothing (isDataConName n) mod
+    = [ IdentInfo (nameOccName n) Nothing mod
         | n <- nn ++ map flSelector flds
       ]
 
@@ -177,7 +179,7 @@ createExportsMapHieDb withHieDb = do
   where
     wrap identInfo = (rendered identInfo, Set.fromList [identInfo])
     -- unwrap :: ExportRow -> IdentInfo
-    unwrap m ExportRow{..} = IdentInfo exportName exportParent exportIsDatacon m
+    unwrap m ExportRow{..} = IdentInfo exportName exportParent m
 
 unpackAvail :: ModuleName -> IfaceExport -> [(Text, Text, [IdentInfo])]
 unpackAvail mn