runDebugger: empty import lists

To pick up any DebugView orphan instances
we want to import the modules from hdv and debugee units,
however we can do so with empty import lists to avoid bringing
any symbols in scope.

One downside, maybe, is that this affects function breakpoints.
Since only the Prelude is in scope at the beginning only
fully qualified names are accepted.

Author: Saizan

haskell-debugger/GHC/Debugger/Monad.hs

@@ -412,7 +412,7 @@ runDebuggerAction l rootDir extraGhcArgs conf loadHomeUnit (Debugger action) = f
       setExposedInUnit interactiveGhcDebuggerUnitId . graphUnits . hsc_mod_graph =<< getSession
 
       -- Set interactive context to import all loaded modules
-      let preludeImp = GHC.IIDecl . GHC.simpleImportDecl $ GHC.mkModuleName "Prelude"
+      let preludeImp = GHC.simpleImportDecl $ GHC.mkModuleName "Prelude"
 
       hsc_env_new <- getSession
 
@@ -431,9 +431,12 @@ runDebuggerAction l rootDir extraGhcArgs conf loadHomeUnit (Debugger action) = f
 
       let
         imports
-          = preludeImp :
+          = map GHC.IIDecl $ preludeImp :
+            [ i { ideclImportList = Just (Exactly, L noAnn []) }
+            | i <- instancesOnly ]
+        instancesOnly =
             dbgViewImps ++
-            [ packageImportDecl pkgName (moduleName modl)
+            [ (packageImportDecl pkgName (moduleName modl))
             | modl <- map GHC.ms_mod mss
             , let uid = moduleUnitId modl
             , let pkgName = fromMaybe (error $ "No package name for: " ++ unitIdString uid) $ lookupUnitPackageName hsc_env_new uid

haskell-debugger/GHC/Debugger/Session.hs

@@ -82,7 +82,7 @@ import qualified GHC.Unit.Home.Graph as HUG
 import qualified Data.Set as Set
 import Data.Maybe
 import GHC.Types.Target (InputFileBuffer)
-import GHC (SingleStep, ExecResult, ModSummary (ms_hspp_opts), ideclPkgQual)
+import GHC (SingleStep, ExecResult, ModSummary (ms_hspp_opts), ideclPkgQual, ImportDecl, GhcPs)
 import Data.Set (Set)
 import qualified GHC.Unit as GHC
 import GHC.Unit.Module.Graph (mg_mss, ModuleGraphNode (..), mnKey)
@@ -433,8 +433,8 @@ lookupUnitPackageName env uid = home_unit_name <|> ext_unit_name
             home_unit_name = PackageQualifier . mkFastString <$> (thisPackageName =<< home_unit_dflags env uid)
             ext_unit_name = const (PackageQualifier (unitIdFS uid)) <$> lookupUnitId (hsc_units env) uid
 
-packageImportDecl :: PackageQualifier -> ModuleName -> GHC.InteractiveImport
-packageImportDecl (PackageQualifier pkgName) mn = GHC.IIDecl $
+packageImportDecl :: PackageQualifier -> ModuleName -> ImportDecl GhcPs
+packageImportDecl (PackageQualifier pkgName) mn =
   (GHC.simpleImportDecl $ mn)
     { ideclPkgQual = RawPkgQual
         StringLiteral

test/golden/T169/T169b.hdb-stdin

@@ -1,4 +1,4 @@
-break --name main
+break --name Main.main
 run
 next
 next

test/golden/self-debug-cli/self-debug-cli.hdb-stdin

@@ -1,4 +1,4 @@
-break --name runDebugger
+break --name GHC.Debugger.Monad.runDebugger
 run cli test/golden/self-debug-cli/Main.hs
 print import GHC.Data.FastString
 print mkFastString "this FastString should be displayed pretty as a string (SHOULD NOT SEE ITS FULL INTERNALS)."

test/haskell/Test/Integration/SelfDebug.hs

@@ -49,7 +49,7 @@ selfDebugDAPTest = do
       waitFiltering_ EventTy "initialized"
 
       _ <- sync $ setFunctionBreakpointsRequest @_ @Value $ object
-        [ "breakpoints" .= [ object [ "name" .= ("runDebugger" :: String) ] ] ]
+        [ "breakpoints" .= [ object [ "name" .= ("GHC.Debugger.Monad.runDebugger" :: String) ] ] ]
 
       _ <- sync configurationDone