Refactor config file to set adapter properties independently

This can later be extended to set adapter properties globally.

.vimspector.json

@@ -1,12 +1,31 @@
 {
-  "simple_c_program - lldb-mi Launch": {
+  "adapters": {
-    "adapter": {
+      "lldb-mi": {
         "name": "lldb-mi",
         "command": [
           "node",
           "/Users/ben/.vscode/extensions/webfreak.debug-0.22.0/out/src/lldb.js"
         ]
       },
+      "cppdbg": {
+        "name": "cppdbg",
+        "command": [ "/Users/ben/.vscode/extensions/ms-vscode.cpptools-0.17.3/debugAdapters/OpenDebugAD7" ],
+        "attach": {
+          "pidProperty": "processId",
+          "pidSelect": "ask"
+        }
+      },
+      "python": {
+        "name": "python",
+        "command": [
+          "node",
+          "/Users/ben/.vscode/extensions/ms-python.python-2018.4.0/out/client/debugger/Main.js"
+        ]
+      }
+  },
+  "configurations": {
+    "simple_c_program - lldb-mi Launch": {
+      "adapter": "lldb-mi",
       "configuration": {
         "request": "launch",
         "target": "support/test/cpp/simple_c_program/test",
@@ -18,10 +37,7 @@
       }
     },
     "simple_c_progra - ms Launch": {
-    "adapter": {
+      "adapter": "cppdbg",
-      "name": "cppdbg",
-      "command": [ "/Users/ben/.vscode/extensions/ms-vscode.cpptools-0.17.3/debugAdapters/OpenDebugAD7" ]
-    },
       "configuration": {
         "name": "ms Launch",
         "type": "cppdbg",
@@ -35,13 +51,7 @@
       }
     },
     "simple_python - launch": {
-    "adapter": {
+      "adapter": "python",
-      "name": "python",
-      "command": [
-        "node",
-        "/Users/ben/.vscode/extensions/ms-python.python-2018.4.0/out/client/debugger/Main.js"
-      ]
-    },
       "configuration": {
         "name": "Python: Current File",
         "type": "python",
@@ -54,14 +64,7 @@
       }
     },
     "simple_c_program - MS Attach": {
-    "adapter": {
+      "adapter": "cppdbg",
-      "name": "cppdbg",
-      "command": [ "/Users/ben/.vscode/extensions/ms-vscode.cpptools-0.17.3/debugAdapters/OpenDebugAD7" ],
-      "attach": {
-        "pidProperty": "processId",
-        "pidSelect": "ask"
-      }
-    },
       "configuration": {
         "name": "(lldb) Attach",
         "type": "cppdbg",
@@ -70,4 +73,5 @@
         "MIMode": "lldb"
       }
     }
+  }
 }

python3/vimspector/debug_session.py

@@ -84,6 +84,9 @@ class DebugSession( object ):
 
 
   def Start( self, configuration = None ):
+    self._configuration = None
+    self._adapter = None
+
     launch_config_file = utils.PathToConfigFile( '.vimspector.json' )
 
     if not launch_config_file:
@@ -92,7 +95,10 @@ class DebugSession( object ):
       return
 
     with open( launch_config_file, 'r' ) as f:
-      launch_config = json.load( f )
+      database = json.load( f )
+
+    launch_config = database.get( 'configurations' )
+    adapters = database.get( 'adapters' )
 
     if not configuration:
       if len( launch_config ) == 1:
@@ -104,6 +110,12 @@ class DebugSession( object ):
     if not configuration:
       return
 
+    adapter = launch_config[ configuration ].get( 'adapter' )
+    if isinstance( adapter, str ):
+      self._adapter = adapters.get( adapter )
+    else:
+      self._adapter = adapter
+
     self._configuration = launch_config[ configuration ]
 
     def start():
@@ -269,11 +281,11 @@ class DebugSession( object ):
 
   def _StartDebugAdapter( self ):
     self._logger.info( 'Starting debug adapter with: {0}'.format( json.dumps(
-      self._configuration[ 'adapter' ] ) ) )
+      self._adapter ) ) )
 
     channel_send_func = vim.bindeval(
       "vimspector#internal#job#StartDebugSession( {0} )".format(
-        json.dumps( self._configuration[ 'adapter' ] ) ) )
+        json.dumps( self._adapter ) ) )
 
     self._connection = debug_adapter_connection.DebugAdapterConnection(
       self,
@@ -338,10 +350,10 @@ class DebugSession( object ):
 
 
   def _Initialise( self ):
-    adapter_config = self._configuration[ 'adapter' ]
+    adapter_config = self._adapter
     launch_config = self._configuration[ 'configuration' ]
 
-    if 'attach' in adapter_config:
+    if launch_config.get( 'request' ) == "attach":
       self._SelectProcess( adapter_config, launch_config )
 
     self._connection.DoRequest( None, {