WIP

Author: alt-romes

test/haskell/Test/DAP.hs

@@ -333,12 +333,15 @@ continueThread tid = do
   pure ()
 
 evaluate :: T.Text -> TestDAP EvaluateResponse
-evaluate expr = do
+evaluate = evaluateWith Nothing
+
+evaluateWith :: Maybe DAP.EvaluateArgumentsContext -> T.Text -> TestDAP EvaluateResponse
+evaluateWith ctx expr = do
   Response{responseBody=Just r} <- sync $ evaluateRequest $
     EvaluateArguments
       { DAP.evaluateArgumentsExpression = expr
       , DAP.evaluateArgumentsFrameId = Nothing
-      , DAP.evaluateArgumentsContext = Nothing
+      , DAP.evaluateArgumentsContext = ctx
       , DAP.evaluateArgumentsFormat = Nothing
       }
   return r

test/haskell/Test/Integration/Evaluate.hs

@@ -20,6 +20,10 @@ evaluateTests =
   testGroup "DAP.Integration.Evaluate"
     [ testCase "Return structured representation for evaluated expressions (issue #116)"
         evaluateStructured
+    , testCase "Imported module bindings available in evaluate context (issue #233)"
+        evaluateImportedBindings
+    , testCase "Imported module bindings available in repl context (issue #233)"
+        replImportedBindings
     ]
 
 evaluateStructured :: Assertion
@@ -38,3 +42,45 @@ evaluateStructured =
         []     -> liftIO $ assertFailure $
           "No variable named 1 in evaluation result: " ++ show respChildren
       disconnect
+
+-- | Test that bindings from imported modules are available when evaluating
+-- expressions at a breakpoint (issue #233).
+evaluateImportedBindings :: Assertion
+evaluateImportedBindings =
+  withTestDAPServer "test/integration/T233" [] $ \test_dir server ->
+    withTestDAPServerClient server $ do
+      let cfg = mkLaunchConfig test_dir "T233.hs"
+      hitBreakpointWith cfg 14
+
+      -- sort is imported from Data.List
+      sortResp <- evaluate "show (sort xs)"
+      liftIO $ assertEqual "sort xs result" "\"[1,1,2,3,4,5,6,9]\"" (DAP.evaluateResponseResult sortResp)
+
+      -- nub is imported from Data.List
+      nubResp <- evaluate "show (nub xs)"
+      liftIO $ assertEqual "nub xs result" "\"[3,1,4,5,9,2,6]\"" (DAP.evaluateResponseResult nubResp)
+
+      -- Map is a qualified import
+      mapResp <- evaluate "show (Map.lookup \"a\" m)"
+      liftIO $ assertEqual "Map.lookup result" "\"Just 1\"" (DAP.evaluateResponseResult mapResp)
+
+      disconnect
+
+-- | Test that bindings from imported modules are available in the REPL context
+-- at a breakpoint (issue #233).
+replImportedBindings :: Assertion
+replImportedBindings =
+  withTestDAPServer "test/integration/T233" [] $ \test_dir server ->
+    withTestDAPServerClient server $ do
+      let cfg = mkLaunchConfig test_dir "T233.hs"
+      hitBreakpointWith cfg 14
+
+      -- sort is imported from Data.List
+      sortResp <- evaluateWith (Just DAP.EvaluateArgumentsContextRepl) "show (sort xs)"
+      liftIO $ assertEqual "sort xs result (repl)" "\"[1,1,2,3,4,5,6,9]\"" (DAP.evaluateResponseResult sortResp)
+
+      -- Map is a qualified import
+      mapResp <- evaluateWith (Just DAP.EvaluateArgumentsContextRepl) "show (Map.lookup \"a\" m)"
+      liftIO $ assertEqual "Map.lookup result (repl)" "\"Just 1\"" (DAP.evaluateResponseResult mapResp)
+
+      disconnect

test/integration/T233/T233.hs

@@ -0,0 +1,15 @@
+module Main where
+
+import Data.List (sort, nub)
+import qualified Data.Map.Strict as Map
+
+main :: IO ()
+main = do
+  let xs = [3, 1, 4, 1, 5, 9, 2, 6] :: [Int]
+  let m = Map.fromList [("a", 1), ("b", 2)] :: Map.Map String Int
+  check xs m
+
+check :: [Int] -> Map.Map String Int -> IO ()
+check xs m = do
+  print xs
+  print m