8 changed files with 23 additions and 88 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@ -13,7 +13,7 @@ defaults:

 jobs:
  PythonLint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-16.04
    container: 'puremourning/vimspector:test'
    steps:
    - uses: actions/checkout@v2
@ -22,7 +22,7 @@ jobs:
    - name: 'Run flake8'
      run: '$HOME/.local/bin/flake8 python3/ *.py'
  VimscriptLint:
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-16.04'
    container: 'puremourning/vimspector:test'
    steps:
    - uses: actions/checkout@v2
@ -32,7 +32,7 @@ jobs:
      run: $HOME/.local/bin/vint autoload/ compiler/ plugin/ tests/ syntax/

  Linux:
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-16.04'
    container:
      image: 'puremourning/vimspector:test'
      options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined
@ -156,7 +156,7 @@ jobs:
    #     SSH_PASS: ${{ secrets.SSH_PASS }} # [V]imspector

  PublishRelease:
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-16.04'
    needs:
      - Linux
      - MacOS
--- a/README.md
+++ b/README.md
@ -61,10 +61,9 @@ For detailed explanation of the `.vimspector.json` format, see the
    * [Closing debugger](#closing-debugger)
    * [Terminate debuggee](#terminate-debuggee)
 * [Debug profile configuration](#debug-profile-configuration)
-    * [C, C++, Rust, etc.](#c-c-rust-etc)
-       * [Data visualization / pretty printing](#data-visualization--pretty-printing)
-       * [C++ Remote debugging](#c-remote-debugging)
-       * [C++ Remote launch and attach](#c-remote-launch-and-attach)
+    * [C, C  , Rust, etc.](#c-c-rust-etc)
+       * [C   Remote debugging](#c-remote-debugging)
+       * [C   Remote launch and attach](#c-remote-launch-and-attach)
    * [Rust](#rust)
    * [Python](#python)
       * [Python Remote Debugging](#python-remote-debugging)
@ -1177,38 +1176,6 @@ licensing.
 }
 ```

-### Data visualization / pretty printing
-
-Depending on the backend you need to enable pretty printing of complex types manually.
-
-* LLDB: Pretty printing is enabled by default
-
-* GDB: To enable gdb pretty printers, consider the snippet below.  
-  It is not enough to have `set print pretty on` in your .gdbinit!
-
-```
-{
-  "configurations": {
-    "Launch": {
-      "adapter": "vscode-cpptools",
-      "configuration": {
-        "request": "launch",
-        "program": "<path to binary>",
-        ...
-        "MIMode": "gdb"
-        "setupCommands": [
-          {
-            "description": "Enable pretty-printing for gdb",
-            "text": "-enable-pretty-printing",
-            "ignoreFailures": true
-          }
-        ],
-      }
-    }
-  }
-}
-```
-
 ### C++ Remote debugging

 The cpptools documentation describes how to attach cpptools to gdbserver using
@ -1401,8 +1368,6 @@ Requires:
 * [Delve][delve-install] installed, e.g. `go get -u github.com/go-delve/delve/cmd/dlv`
 * Delve to be in your PATH, or specify the `dlvToolPath` launch option

-NOTE: Vimspector uses the ["legacy" vscode-go debug adapter](https://github.com/golang/vscode-go/blob/master/docs/debugging-legacy.md) rather than the "built-in" DAP support in Delve. You can track https://github.com/puremourning/vimspector/issues/186 for that.
-
 ```json
 {
  "configurations": {
@ -1420,7 +1385,7 @@ NOTE: Vimspector uses the ["legacy" vscode-go debug adapter](https://github.com/
 ```

 See the vscode-go docs for
-[troubleshooting information](https://github.com/golang/vscode-go/blob/master/docs/debugging-legacy.md#troubleshooting)
+[troubleshooting information](https://github.com/golang/vscode-go/blob/master/docs/debugging.md#troubleshooting)

 ## PHP

--- a/python3/vimspector/gadgets.py
+++ b/python3/vimspector/gadgets.py
@ -30,12 +30,12 @@ GADGETS = {
                                                                root,
                                                                gadget ),
    'all': {
-      'version': '1.6.0',
+      'version': '0.27.0',
      "adapters": {
        "vscode-cpptools": {
          "name": "cppdbg",
          "command": [
-            "${gadgetDir}/vscode-cpptools/debugAdapters/bin/OpenDebugAD7"
+            "${gadgetDir}/vscode-cpptools/debugAdapters/OpenDebugAD7"
          ],
          "attach": {
            "pidProperty": "processId",
@ -53,17 +53,17 @@ GADGETS = {
    'linux': {
      'file_name': 'cpptools-linux.vsix',
      'checksum':
-        'c25299bcfb46b22d41aa3f125df7184e6282a35ff9fb69c47def744cb4778f55',
+        '3695202e1e75a03de18049323b66d868165123f26151f8c974a480eaf0205435',
    },
    'macos': {
-      'file_name': 'cpptools-osx-arm64.vsix',
+      'file_name': 'cpptools-osx.vsix',
      'checksum':
-        'ceb3e8cdaa2b5bb45af50913ddd8402089969748af8d70f5d46480408287ba6f',
+        'cb061e3acd7559a539e5586f8d3f535101c4ec4e8a48195856d1d39380b5cf3c',
    },
    'windows': {
      'file_name': 'cpptools-win32.vsix',
      'checksum':
-        'ef7ac5831874a3c7dbf0feb826bfda2be579aff9b6d990622fff1d0d4ede00d1',
+        'aa294368ed16d48c59e49c8000e146eae5a19ad07b654efed5db8ec93b24229e',
      "adapters": {
        "vscode-cpptools": {
          "name": "cppdbg",
@ -394,12 +394,12 @@ GADGETS = {
             '${version}/${file_name}',
    },
    'all': {
-      'version': 'v1.6.6',
+      'version': 'v1.6.5',
    },
    'macos': {
-      'file_name': 'codelldb-aarch64-darwin.vsix',
+      'file_name': 'codelldb-x86_64-darwin.vsix',
      'checksum':
-        '5adc3b9139eabdafd825bd5efc55df4424a203fb2b6087b425cd434956e7ec58',
+        'e7d9f4f8ec3c3774af6d1dbf11f0568db1417c4d51038927228cd07028725594',
      'make_executable': [
        'adapter/codelldb',
        'lldb/bin/debugserver',
--- a/python3/vimspector/installer.py
+++ b/python3/vimspector/installer.py
@ -358,8 +358,7 @@ def InstallCppTools( name, root, gadget ):
  # It's hilarious, but the execute bits aren't set in the vsix. So they
  # actually have javascript code which does this. It's just a horrible horrible
  # hack that really is not funny.
-  MakeExecutable(
-    os.path.join( extension, 'debugAdapters', 'bin', 'OpenDebugAD7' ) )
+  MakeExecutable( os.path.join( extension, 'debugAdapters', 'OpenDebugAD7' ) )
  with open( os.path.join( extension, 'package.json' ) ) as f:
    package = json.load( f )
    runtime_dependencies = package[ 'runtimeDependencies' ]
--- a/support/custom_ui_vimrc
+++ b/support/custom_ui_vimrc
@ -54,7 +54,7 @@ function s:SetUpTerminal()
  let padding = 4
  let cols = max( [ min( [ &columns - left_bar - code - padding, 80 ] ), 10 ] )
  call win_gotoid( terminal_win )
-  execute string(cols) . 'wincmd |'
+  execute cols . 'wincmd |'
 endfunction

 function! s:CustomiseWinBar()
--- a/support/test/bash/.vimspector.json
+++ b/support/test/bash/.vimspector.json
@ -1,15 +0,0 @@
-{
-  "$schema": "https://puremourning.github.io/vimspector/schema/vimspector.schema.json",
-  "configurations": {
-    "Run Current Script": {
-      "adapter": "vscode-bash",
-      "autoselect": false,
-      "configuration": {
-        "request": "launch",
-        "program": "${file}",
-        "cwd": "${fileDirname}",
-        "args": [ "*${args}" ]
-      }
-    }
-  }
-}
--- a/tests/testdata/cpp/simple/.vimspector.json
+++ b/tests/testdata/cpp/simple/.vimspector.json
@ -12,7 +12,7 @@
        "externalConsole": false,
        "stopAtEntry": true,
        "stopOnEntry": true,
-        "MIMode": "${VIMSPECTOR_MIMODE}"
+        "MImode": "${VIMSPECTOR_MIMODE}"
      },
      "breakpoints": {
        "exception": {
@ -33,7 +33,7 @@
        "externalConsole": false,
        "stopAtEntry": false,
        "stopOnEntry": false,
-        "MIMode": "${VIMSPECTOR_MIMODE}"
+        "MImode": "${VIMSPECTOR_MIMODE}"
      },
      "breakpoints": {
        "exception": {
@ -55,7 +55,7 @@
        "externalConsole": false,
        "stopAtEntry": false,
        "stopOnEntry": false,
-        "MIMode": "${VIMSPECTOR_MIMODE}"
+        "MImode": "${VIMSPECTOR_MIMODE}"
      },
      "breakpoints": {
        "exception": {
@ -82,7 +82,7 @@
      "configuration": {
        "request": "launch",
        "program": "${workspaceRoot}/${fileBasenameNoExtension}",
-        "MIMode": "${VIMSPECTOR_MIMODE}",
+        "MImode": "${VIMSPECTOR_MIMODE}",
        "externalConsole": false,
        "args": [
          "CALCULATED_LIST", "${CALCULATED_LIST}",
--- a/tests/variables.test.vim
+++ b/tests/variables.test.vim
@ -194,7 +194,6 @@ function! Test_ExpandVariables()
        \     [
        \       '- Scope: Locals',
        \       ' *+ t (Test): {...}',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -220,7 +219,6 @@ function! Test_ExpandVariables()
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -239,7 +237,6 @@ function! Test_ExpandVariables()
        \       '    - c (char): 0 ''\\0\{1,3}''',
        \       '    - fffff (float): 0',
        \       '    + another_test (AnotherTest):\( {...}\)\?',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -256,7 +253,6 @@ function! Test_ExpandVariables()
        \     [
        \       '- Scope: Locals',
        \       '  + t (Test): {...}',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -271,7 +267,6 @@ function! Test_ExpandVariables()
        \     [
        \       '- Scope: Locals',
        \       '  + t (Test): {...}',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -291,7 +286,6 @@ function! Test_ExpandVariables()
        \       '   \*- c (char): 99 ''c''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -308,7 +302,6 @@ function! Test_ExpandVariables()
        \   assert_equal(
        \     [
        \       '+ Scope: Locals',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -323,7 +316,6 @@ function! Test_ExpandVariables()
        \   assert_equal(
        \     [
        \       '+ Scope: Locals',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -339,7 +331,6 @@ function! Test_ExpandVariables()
        \   assert_equal(
        \     [
        \       '+ Scope: Locals',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -855,7 +846,6 @@ function! Test_SetVariableValue_Local()
        \     [
        \       '- Scope: Locals',
        \       ' *+ t (Test): {...}',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -881,7 +871,6 @@ function! Test_SetVariableValue_Local()
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -908,7 +897,6 @@ EOF
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -928,7 +916,6 @@ EOF
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -948,7 +935,6 @@ EOF
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
-        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,