Fix for error message on program exit

ptvsd/debugger.py

@@ -22,4 +22,8 @@ def debug(filename, port_num, debug_id, debug_options, run_as):
             '--client', '127.0.0.1',
             '--file', filename,
             ]
-    pydevd.main()
+    try:
+        pydevd.main()
+    except SystemExit as ex:
+        ptvsd.wrapper.ptvsd_sys_exit_code = ex.code
+        raise

ptvsd/wrapper.py

@@ -5,6 +5,7 @@
 # TODO: with_statement is not needed
 from __future__ import print_function, with_statement, absolute_import
 
+import atexit
 import os
 import socket
 import sys
@@ -33,6 +34,7 @@
 #    print(s)
 #ipcjson._TRACE = ipcjson_trace
 
+ptvsd_sys_exit_code = 0
 
 def unquote(s):
     if s is None:
@@ -244,6 +246,8 @@ def __init__(self, socket, pydevd, logfile=None):
 
     def close(self):
         # TODO: docstring
+        global ptvsd_sys_exit_code
+        self.send_event('exited', exitCode=ptvsd_sys_exit_code)
         if self.socket:
             self.socket.close()
 
@@ -700,6 +704,8 @@ def start_server(port):
     server_thread.daemon = True
     server_thread.start()
 
+    atexit.register(proc.close)
+
     return pydevd
 
 
@@ -719,6 +725,8 @@ def start_client(host, port):
     server_thread.daemon = True
     server_thread.start()
 
+    atexit.register(proc.close)
+
     return pydevd