From b65884c7b414ec7306463bde1354d666c32843c8 Mon Sep 17 00:00:00 2001
From: Karthik Nadig <karthik.nadig@live.com>
Date: Wed, 21 Mar 2018 23:23:43 -0700
Subject: [PATCH] Enable modules support

---
 debugger_protocol/messages/_requests.py | 1 +
 ptvsd/wrapper.py                        | 3 ++-
 tests/highlevel/test_lifecycle.py       | 2 ++
 tests/highlevel/test_live_pydevd.py     | 1 +
 tests/highlevel/test_messages.py        | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debugger_protocol/messages/_requests.py b/debugger_protocol/messages/_requests.py
index edb018b0..1281366a 100644
--- a/debugger_protocol/messages/_requests.py
+++ b/debugger_protocol/messages/_requests.py
@@ -80,6 +80,7 @@ class Capabilities(FieldsNamespace):
         Field('supportsDelayedStackTraceLoading', bool),
         Field('supportsLoadedSourcesRequest', bool),
         Field('supportsSetExpression', bool),
+        Field('supportsModulesRequest', bool),
     ]
 
 
diff --git a/ptvsd/wrapper.py b/ptvsd/wrapper.py
index 3a3c980e..7d02446c 100644
--- a/ptvsd/wrapper.py
+++ b/ptvsd/wrapper.py
@@ -678,6 +678,7 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
             supportsEvaluateForHovers=True,
             supportsValueFormattingOptions=True,
             supportsSetExpression=True,
+            supportsModulesRequest=True,
             exceptionBreakpointFilters=[
                 {
                     'filter': 'raised',
@@ -1081,7 +1082,7 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
         cmd_args = (pyd_tid, pyd_fid, 'LOCAL', expr, '1')
         msg = '\t'.join(str(s) for s in cmd_args)
         with (yield self.using_format(fmt)):
-            _, _, _ = yield self.pydevd_request(
+            yield self.pydevd_request(
                 pydevd_comm.CMD_EXEC_EXPRESSION,
                 msg)
 
diff --git a/tests/highlevel/test_lifecycle.py b/tests/highlevel/test_lifecycle.py
index ab07eded..ff2e5325 100644
--- a/tests/highlevel/test_lifecycle.py
+++ b/tests/highlevel/test_lifecycle.py
@@ -71,6 +71,7 @@ class LifecycleTests(HighlevelTest, unittest.TestCase):
                 ],
                 supportsEvaluateForHovers=True,
                 supportsSetExpression=True,
+                supportsModulesRequest=True,
             )),
             self.new_event('initialized'),
             self.new_response(req_attach),
@@ -135,6 +136,7 @@ class LifecycleTests(HighlevelTest, unittest.TestCase):
                 ],
                 supportsEvaluateForHovers=True,
                 supportsSetExpression=True,
+                supportsModulesRequest=True,
             )),
             self.new_event('initialized'),
             self.new_response(req_launch),
diff --git a/tests/highlevel/test_live_pydevd.py b/tests/highlevel/test_live_pydevd.py
index 8f08470b..ffd06b29 100644
--- a/tests/highlevel/test_live_pydevd.py
+++ b/tests/highlevel/test_live_pydevd.py
@@ -125,6 +125,7 @@ class LifecycleTests(TestBase, unittest.TestCase):
                 ],
                 supportsEvaluateForHovers=True,
                 supportsSetExpression=True,
+                supportsModulesRequest=True,
             )),
             self.new_event('initialized'),
             self.new_response(req_attach),
diff --git a/tests/highlevel/test_messages.py b/tests/highlevel/test_messages.py
index a7879035..6102985e 100644
--- a/tests/highlevel/test_messages.py
+++ b/tests/highlevel/test_messages.py
@@ -124,6 +124,7 @@ class InitializeTests(LifecycleTest, unittest.TestCase):
                 ],
                 supportsEvaluateForHovers=True,
                 supportsSetExpression=True,
+                supportsModulesRequest=True,
             )),
             self.new_event(1, 'initialized'),
         ])