remove unnecessary resource handling abstraction: DapSourceRefDescriptor

Author: csabahruska

dap-estgi-server/src/Breakpoints.hs

@@ -52,8 +52,8 @@ commandSetBreakpoints = do
   ESTG {..} <- getDebugSession
   case (setBreakpointsArgumentsBreakpoints, maybeSourceRef, maybeSourceRef >>= flip Bimap.lookupR dapSourceRefMap) of
     -- HINT: breakpoint on Haskell
-    (Just sourceBreakpoints, Just sourceRef, Just (SourceRef_SourceFileInFullpak hsCodeDesc@(Haskell pkg mod)))
-      | Just extStgSourceRef <- Bimap.lookup (SourceRef_SourceFileInFullpak $ ExtStg pkg mod) dapSourceRefMap
+    (Just sourceBreakpoints, Just sourceRef, Just hsCodeDesc@(Haskell pkg mod))
+      | Just extStgSourceRef <- Bimap.lookup (ExtStg pkg mod) dapSourceRefMap
       , Just hsSourceFilePath <- Bimap.lookupR hsCodeDesc haskellSrcPathMap
       -> do
       (_sourceCodeText, _locations, hsSrcLocs) <- getSourceFromFullPak extStgSourceRef
@@ -110,7 +110,7 @@ commandSetBreakpoints = do
       sendSetBreakpointsResponse breakpoints
 
     -- HINT: breakpoint on ExtStg
-    (Just sourceBreakpoints, Just sourceRef, Just (SourceRef_SourceFileInFullpak ExtStg{})) -> do
+    (Just sourceBreakpoints, Just sourceRef, Just ExtStg{}) -> do
       (_sourceCodeText, locations, _hsSrcLocs) <- getSourceFromFullPak sourceRef
       breakpoints <- forM sourceBreakpoints $ \SourceBreakpoint{..} -> do
         -- filter all relevant ranges

dap-estgi-server/src/DapBase.hs

@@ -103,10 +103,6 @@ data SourceCodeDescriptor
   | ForeignC  PackageName FilePath
   deriving (Show, Read, Eq, Ord)
 
-data DapSourceRefDescriptor
-  = SourceRef_SourceFileInFullpak SourceCodeDescriptor
-  deriving (Show, Read, Eq, Ord)
-
 ----------------------------------------------------------------------------
 -- | External STG Interpreter application internal state
 data ESTG
@@ -117,11 +113,11 @@ data ESTG
   , sourceCodeSet     :: Set SourceCodeDescriptor
   , unitIdMap         :: Bimap UnitId PackageName
   , haskellSrcPathMap :: Bimap Name SourceCodeDescriptor
-  , dapSourceNameMap  :: Bimap Text DapSourceRefDescriptor
+  , dapSourceNameMap  :: Bimap Text SourceCodeDescriptor
 
   -- application specific resource handling
 
-  , dapSourceRefMap       :: !(Bimap DapSourceRefDescriptor Int)
+  , dapSourceRefMap       :: !(Bimap SourceCodeDescriptor Int)
     -- ^ Used to track source reference IDs
     --
   , dapFrameIdMap         :: !(Bimap DapFrameIdDescriptor Int)

dap-estgi-server/src/Main.hs

@@ -197,8 +197,8 @@ initESTG AttachArgs {..} = do
         , sourceCodeSet         = Set.fromList sourceCodeList
         , unitIdMap             = unitIdMap
         , haskellSrcPathMap     = haskellSrcPathMap
-        , dapSourceNameMap      = Bimap.fromList [(cs $ getSourceName d, SourceRef_SourceFileInFullpak d) | d <- sourceCodeList]
-        , dapSourceRefMap       = Bimap.fromList $ zip (map SourceRef_SourceFileInFullpak sourceCodeList) [1..]
+        , dapSourceNameMap      = Bimap.fromList [(cs $ getSourceName d, d) | d <- sourceCodeList]
+        , dapSourceRefMap       = Bimap.fromList $ zip sourceCodeList [1..]
         , dapFrameIdMap         = Bimap.empty
         , dapVariablesRefMap    = Bimap.empty
         , dapStackFrameCache    = mempty
@@ -363,7 +363,7 @@ talk CommandLoadedSources = do
           ForeignC{}  -> True
           _           -> False
     srcSet <- getsApp sourceCodeSet
-    mapM (getSourceFromSourceRefDescriptor . SourceRef_SourceFileInFullpak) $ filter shouldInclude $ Set.toList srcSet
+    mapM getSourceFromSourceCodeDescriptor $ filter shouldInclude $ Set.toList srcSet
 
 ----------------------------------------------------------------------------
 talk (CustomCommand "getSourceLinks") = customCommandGetSourceLinks

dap-estgi-server/src/SourceCode.hs

@@ -135,7 +135,7 @@ getValidSourceRefFromSource Source{..} = do
 getSourceFromFullPak :: SourceId -> Adaptor ESTG (Text, [(StgPoint, SrcRange)], [(StgPoint, Tickish)])
 getSourceFromFullPak sourceId = do
   ESTG {..} <- getDebugSession
-  SourceRef_SourceFileInFullpak srcDesc <- case Bimap.lookupR sourceId dapSourceRefMap of
+  srcDesc <- case Bimap.lookupR sourceId dapSourceRefMap of
     Nothing     -> do
       sendError (ErrorMessage (T.pack $ "Unknown sourceId: " ++ show sourceId)) Nothing
     Just value  -> pure value
@@ -151,32 +151,32 @@ getSourceFromFullPak sourceId = do
         ir <- readModpakS fullPakPath sourcePath T.decodeUtf8
         pure (ir, [], [])
 
-getSourceFromSourceRefDescriptor :: DapSourceRefDescriptor -> Adaptor ESTG Source
-getSourceFromSourceRefDescriptor sourceRefDesc@(SourceRef_SourceFileInFullpak srcDesc) = do
+getSourceFromSourceCodeDescriptor :: SourceCodeDescriptor -> Adaptor ESTG Source
+getSourceFromSourceCodeDescriptor srcDesc = do
   srcDescSet <- getsApp sourceCodeSet
   extraSources <- case srcDesc of
     Haskell packageName qualModName
       | cStub <- FFICStub packageName qualModName
       , hStub <- FFIHStub packageName qualModName
       -> Just <$> sequence (
-      [ getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak $ ExtStg   packageName qualModName)
-      , getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak $ GhcCore  packageName qualModName)
-      , getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak $ GhcStg   packageName qualModName)
-      , getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak $ Cmm      packageName qualModName)
-      , getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak $ Asm      packageName qualModName)
-      , getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak $ ModInfo  packageName qualModName)
+      [ getSourceFromSourceCodeDescriptor (ExtStg   packageName qualModName)
+      , getSourceFromSourceCodeDescriptor (GhcCore  packageName qualModName)
+      , getSourceFromSourceCodeDescriptor (GhcStg   packageName qualModName)
+      , getSourceFromSourceCodeDescriptor (Cmm      packageName qualModName)
+      , getSourceFromSourceCodeDescriptor (Asm      packageName qualModName)
+      , getSourceFromSourceCodeDescriptor (ModInfo  packageName qualModName)
       ] ++
-      [ getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak cStub)
+      [ getSourceFromSourceCodeDescriptor cStub
       | Set.member cStub srcDescSet
       ] ++
-      [ getSourceFromSourceRefDescriptor (SourceRef_SourceFileInFullpak hStub)
+      [ getSourceFromSourceCodeDescriptor hStub
       | Set.member hStub srcDescSet
       ])
 
     _ -> pure Nothing
 
   let sourceName = cs $ getSourceName srcDesc
-  sourceRef <- getSourceRef sourceRefDesc
+  sourceRef <- getSourceRef srcDesc
   ESTG {..} <- getDebugSession
   pure defaultSource
     { sourceName            = Just $ sourceName -- used in source tree children
@@ -185,7 +185,7 @@ getSourceFromSourceRefDescriptor sourceRefDesc@(SourceRef_SourceFileInFullpak sr
     , sourceSources         = extraSources
     }
 
-getSourceRef :: DapSourceRefDescriptor -> Adaptor ESTG Int
+getSourceRef :: SourceCodeDescriptor -> Adaptor ESTG Int
 getSourceRef key = do
   -- NOTE: Source code related db is populated at initialization
   getsApp (Bimap.lookup key . dapSourceRefMap) >>= \case

dap-estgi-server/src/SourceLocation.hs

@@ -46,7 +46,7 @@ getSourceAndPositionForStgPoint stgPoint = do
     Nothing -> sendError (ErrorMessage (T.pack $ "Unknown unit id: " ++ show unitId)) Nothing
     Just v  -> pure v
   let moduleName = cs $ getModuleName moduleNameBS
-  source <- getSourceFromSourceRefDescriptor $ SourceRef_SourceFileInFullpak $ ExtStg packageName moduleName
+  source <- getSourceFromSourceCodeDescriptor $ ExtStg packageName moduleName
   let Just sourceRef = sourceSourceReference source
   (_sourceCodeText, locations, hsSrcLocs) <- getSourceFromFullPak sourceRef
   let inModule pkg mod (_, SourceNote{..})
@@ -68,7 +68,7 @@ getSourceAndPositionForStgPoint stgPoint = do
       | RealSrcSpan'{..} <- sourceSpan
       , Just hsSrcDesc <- Bimap.lookup srcSpanFile haskellSrcPathMap
       -> do
-      sourceHs <- getSourceFromSourceRefDescriptor $ SourceRef_SourceFileInFullpak hsSrcDesc
+      sourceHs <- getSourceFromSourceCodeDescriptor hsSrcDesc
       pure (Just sourceHs, srcSpanSLine, srcSpanSCol, srcSpanELine, srcSpanECol)
     _ -> do
       case filter ((== stgPoint) . fst) locations of
@@ -102,8 +102,8 @@ customCommandGetSourceLinks = do
   GetSourceLinksArguments {..} <- getArguments
   ESTG {..} <- getDebugSession
   sourceLinks <- case Bimap.lookup getSourceLinksArgumentsPath dapSourceNameMap of
-    Just srcDesc@(SourceRef_SourceFileInFullpak ExtStg{}) -> do
-      source <- getSourceFromSourceRefDescriptor srcDesc
+    Just srcDesc@ExtStg{} -> do
+      source <- getSourceFromSourceCodeDescriptor srcDesc
       let Just sourceRef = sourceSourceReference source
       (_sourceCodeText, locations, hsSrcLocs) <- getSourceFromFullPak sourceRef
       let hsTickishLocMap = Map.unionsWith mappend [Map.singleton stgPoint [tickish] | (stgPoint, tickish) <- hsSrcLocs]