Modify for mac m1

Merge pull request #452 from seezer/readme-gdb-prettyprinter
Readme: pretty printing with vscode-cpptools / gdb
2021-09-10 10:30:44 -06:00 · 2021-09-09 16:19:52 +00:00 · 2021-09-09 16:05:28 +00:00 · 2021-09-09 16:59:01 +02:00 · 2021-09-08 22:49:22 +01:00 · 2021-09-08 22:30:49 +01:00
61 changed files with 5391 additions and 1210 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -17,12 +17,12 @@ assignees: ''

 > Please answer the following questions

-* Does your issue reproduce using `vim -Nu /path/to/vimspector/support/minimal_vimrc` ? \[Yes/No]
+* Does your issue reproduce using `vim --clean -Nu /path/to/vimspector/support/minimal_vimrc` ? \[Yes/No]
 * If you are using Neovim, does your issue reproduce using Vim? \[Yes/No]

 > List of steps to reproduce:

-> 1. Run `vim -Nu /path/to/vimspector/support/minimal_vimrc`
+> 1. Run `vim ---clean Nu /path/to/vimspector/support/minimal_vimrc`
 > 2. Open _this project_...
 > 3. Press _this sequence of keys_

@ -57,6 +57,12 @@ discussing on Gitter rather than raising an issue.
 * Version of Vimspector: (e.g. output of `git rev-parse HEAD` if cloned or the
  name of the tarball used to install otherwise)

+* Output of `:VimspectorDebugInfo`
+
+```
+paste here
+```
+
 * Output of `vim --version` or `nvim --version`

 ```
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@ -13,7 +13,7 @@ defaults:

 jobs:
  PythonLint:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.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-16.04'
+    runs-on: 'ubuntu-18.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-16.04'
+    runs-on: 'ubuntu-18.04'
    container:
      image: 'puremourning/vimspector:test'
      options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined
@ -111,6 +111,16 @@ jobs:
        path: gadgets/macos/download
      name: Cache gadgets

+    - name: 'Install .NET Core SDK 3.1'
+      uses: actions/setup-dotnet@v1.7.2
+      with:
+        dotnet-version: 3.1
+
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: ^11
+      name: "Switch to xcode 11 because of .NET debugging bug"
+
    - run: vim --version
      name: 'Print vim version information'

@ -143,10 +153,10 @@ jobs:
    #   if: failure()
    #   with:
    #     NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
-    #     SSH_PASS: ${{ secrets.SSH_PASS }}
+    #     SSH_PASS: ${{ secrets.SSH_PASS }} # [V]imspector

  PublishRelease:
-    runs-on: 'ubuntu-16.04'
+    runs-on: 'ubuntu-18.04'
    needs:
      - Linux
      - MacOS
--- a/.github/workflows/lock_old_issues.yaml
+++ b/.github/workflows/lock_old_issues.yaml
@ -0,0 +1,27 @@
+name: "Lock Old Issues"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: '60'
+          # issue-exclude-created-before: ''
+          # issue-exclude-labels: ''
+          # issue-lock-labels: ''
+          # issue-lock-comment: ''
+          # issue-lock-reason: 'resolved'
+          # pr-lock-inactive-days: '365'
+          # pr-exclude-created-before: ''
+          # pr-exclude-labels: ''
+          # pr-lock-labels: ''
+          # pr-lock-comment: ''
+          # pr-lock-reason: 'resolved'
+          process-only: 'issues'
--- a/.gitignore
+++ b/.gitignore
@ -20,3 +20,4 @@ support/test/csharp/*.exe*
 configurations/
 venv/
 test-base/
+tags
--- a/.mergify.yml
+++ b/.mergify.yml
@ -9,9 +9,8 @@ pull_request_rules:
      # CI https://doc.mergify.io/conditions.html#github-actions
      - status-success=PythonLint
      - status-success=VimscriptLint
+      - status-success=Linux
      - status-success=MacOS
-
-
    actions: &merge-actions
      merge:
        method: merge
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@ -42,7 +42,17 @@ def Settings( **kwargs ):
    return {
      'sys_path': [
        p.join( PATH_TO_THIS_DIR, 'python3' )
-      ]
+      ],
+      'ls': {
+        'python': {
+          'analysis': {
+            'extraPaths': [
+              p.join( PATH_TO_THIS_DIR, 'python3' ),
+            ],
+            'useLibraryCodeForTypes': True
+          }
+        }
+      }
    }

  if IgnoreExtraConf:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -46,6 +46,23 @@ The GitHub issue tracker is for *bug reports* and *features requests* for the
 Vimspector project, and on-topic comments and follow-ups to them. It is not for
 general discussion, general support or for any other purpose.

+Please **search the issue tracker for similar issues** before creating a new
+one. There's no point in duplication; if an existing open issue addresses your
+problem, please comment there instead of creating a duplicate. However, if the
+issue you found is **closed as resolved** (e.g. with a PR or the original user's
+problem was resolved), raise a **new issue**, because you've found a new
+problem. Reference the original issue if you think that's useful information.
+
+Closed issues which have been inactive for 60 days will be locked, this helps to
+keep discussions focussed. If you believe you are still experiencing an issue
+which has been closed, please raise a new issue, completing the issue template.
+
+If you do find a similar _open_ issue, **don't just post 'me too' or similar**
+responses. This almost never helps resolve the issue, and just causes noise for
+the maintainers. Only post if it will aid the maintainers in solving the issue;
+if there are existing diagnostics requested in the thread, perform
+them and post the results.
+
 Please do not be offended if your Issue or comment is closed or hidden, for any
 of the following reasons:

@ -53,6 +70,7 @@ of the following reasons:
 * The issue or comment is off-topic
 * The issue does not represent a Vimspector bug or feature request
 * The issue cannot be reasonably reproduced using the minimal vimrc
+* The issue is a duplicate of an existing issue
 * etc.

 Issue titles are important. It's not usually helpful to write a title like
@ -83,7 +101,7 @@ in the issue report.
 The minimal vimrc is in `support/test/minimal_vimrc` and can be used as follows:

 ```
-vim -Nu /path/to/vimspector/support/minimal_vimrc
+vim --clean -Nu /path/to/vimspector/support/minimal_vimrc
 ```

 ## Pull Requests
--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 For a tutorial and usage overview, take a look at the
 [Vimspector website][website].

-For detailed explanatin of the `.vimspector.json` format, see the
+For detailed explanation of the `.vimspector.json` format, see the
 [reference guide][vimspector-ref].

 ![Build](https://github.com/puremourning/vimspector/workflows/Build/badge.svg?branch=master) [![Gitter](https://badges.gitter.im/vimspector/Lobby.svg)](https://gitter.im/vimspector/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
@ -59,15 +59,16 @@ For detailed explanatin of the `.vimspector.json` format, see the
       * [Console autocompletion](#console-autocompletion)
       * [Log View](#log-view)
    * [Closing debugger](#closing-debugger)
+    * [Terminate debuggee](#terminate-debuggee)
 * [Debug profile configuration](#debug-profile-configuration)
-    * [C, C  , Rust, etc.](#c-c-rust-etc)
-       * [C   Remote debugging](#c-remote-debugging)
-       * [C   Remote launch and attach](#c-remote-launch-and-attach)
+    * [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)
    * [Rust](#rust)
    * [Python](#python)
       * [Python Remote Debugging](#python-remote-debugging)
       * [Python Remote launch and attach](#python-remote-launch-and-attach)
-       * [Legacy: vscode-python](#legacy-vscode-python)
    * [TCL](#tcl)
    * [C♯](#c)
    * [Go](#go)
@ -76,6 +77,7 @@ For detailed explanatin of the `.vimspector.json` format, see the
       * [Debug cli application](#debug-cli-application)
    * [JavaScript, TypeScript, etc.](#javascript-typescript-etc)
    * [Java](#java)
+       * [Hot code replace](#hot-code-replace)
       * [Usage with YouCompleteMe](#usage-with-youcompleteme)
       * [Other LSP clients](#other-lsp-clients)
    * [Lua](#lua)
@ -91,14 +93,14 @@ For detailed explanatin of the `.vimspector.json` format, see the
    * [Example](#example)
 * [FAQ](#faq)

-<!-- Added by: ben, at: Sun 21 Feb 2021 21:15:32 GMT -->
+<!-- Added by: ben, at: Fri 19 Mar 2021 22:57:28 GMT -->

 <!--te-->

 # Features and Usage

 The plugin is a capable Vim graphical debugger for multiple languages.
-It's mostly tested for c++, python and TCL, but in theory supports any
+It's mostly tested for C++, Python and TCL, but in theory supports any
 language that Visual Studio Code supports (but see caveats).

 The [Vimspector website][website] has an overview of the UI, along with basic
@ -143,23 +145,24 @@ runtime dependencies). They are categorised by their level of support:
 * `Supported` : Fully supported, frequently used and manually tested
 * `Experimental`: Working, but not frequently used and rarely tested
 * `Legacy`: No longer supported, please migrate your config
+* `Retired`: No longer included or supported.

-| Language           | Status       | Switch (for `install_gadget.py`)   | Adapter (for `:VimspectorInstall`) | Dependencies                               |
-|--------------------|--------------|------------------------------------|------------------------------------|--------------------------------------------|
-| C, C++, Rust etc.  | Tested       | `--all` or `--enable-c` (or cpp)   | vscode-cpptools                    | mono-core                                  |
-| Rust, C, C++, etc. | Supported    | `--force-enable-rust`              | CodeLLDB                           | Python 3                                   |
-| Python             | Tested       | `--all` or `--enable-python`       | debugpy                            | Python 2.7 or Python 3                     |
-| Go                 | Tested       | `--enable-go`                      | vscode-go                          | Go, [Delve][]                              |
-| TCL                | Supported    | `--all` or `--enable-tcl`          | tclpro                             | TCL 8.5                                    |
-| Bourne Shell       | Supported    | `--all` or `--enable-bash`         | vscode-bash-debug                  | Bash v??                                   |
-| Lua                | Supported    | `--all` or `--enable-lua`          | local-lua-debugger-vscode          | Node >=12.13.0, Npm, Lua interpreter       |
-| Node.js            | Supported    | `--force-enable-node`              | vscode-node-debug2                 | 6 < Node < 12, Npm                         |
-| Javascript         | Supported    | `--force-enable-chrome`            | debugger-for-chrome                | Chrome                                     |
-| Java               | Supported    | `--force-enable-java  `            | vscode-java-debug                  | Compatible LSP plugin (see [later](#java)) |
-| C# (dotnet core)   | Experimental | `--force-enable-csharp`            | netcoredbg                         | DotNet core                                |
-| C# (mono)          | Experimental | `--force-enable-csharp`            | vscode-mono-debug                  | Mono                                       |
-| F#, VB, etc.       | Experimental | `--force-enable-fsharp` (or vbnet) | netcoredbg                         | DotNet core                                |
-| Python.legacy      | Legacy       | `--force-enable-python.legacy`     | vscode-python                      | Node 10, Python 2.7 or Python 3            |
+| Language           | Status    | Switch (for `install_gadget.py`) | Adapter (for `:VimspectorInstall`) | Dependencies                               |
+|--------------------|-----------|----------------------------------|------------------------------------|--------------------------------------------|
+| C, C++, Rust etc.  | Tested    | `--all` or `--enable-c` (or cpp) | vscode-cpptools                    | mono-core                                  |
+| Rust, C, C++, etc. | Supported | `--force-enable-rust`            | CodeLLDB                           | Python 3                                   |
+| Python             | Tested    | `--all` or `--enable-python`     | debugpy                            | Python 2.7 or Python 3                     |
+| Go                 | Tested    | `--enable-go`                    | vscode-go                          | Node, Go, [Delve][]                        |
+| TCL                | Supported | `--all` or `--enable-tcl`        | tclpro                             | TCL 8.5                                    |
+| Bourne Shell       | Supported | `--all` or `--enable-bash`       | vscode-bash-debug                  | Bash v??                                   |
+| Lua                | Supported | `--all` or `--enable-lua`        | local-lua-debugger-vscode          | Node >=12.13.0, Npm, Lua interpreter       |
+| Node.js            | Supported | `--force-enable-node`            | vscode-node-debug2                 | 6 < Node < 12, Npm                         |
+| Javascript         | Supported | `--force-enable-chrome`          | debugger-for-chrome                | Chrome                                     |
+| Java               | Supported | `--force-enable-java  `          | vscode-java-debug                  | Compatible LSP plugin (see [later](#java)) |
+| C# (dotnet core)   | Tested    | `--force-enable-csharp`          | netcoredbg                         | DotNet core                                |
+| F#, VB, etc.       | Supported | `--force-enable-[fsharp,vbnet]`  | `, `--force-enable-vbnet`          | netcoredbg                                 | DotNet core |
+| C# (mono)          | _Retired_ | N/A                              | N/A                                | N/A                                        |
+| Python.legacy      | _Retired_ | N/A                              | N/A                                | N/A                                        |

 ## Other languages

@ -288,7 +291,7 @@ If you just want to try out vimspector without changing your vim config, there
 are example projects for a number of languages in `support/test`, including:

 * Python (`support/test/python/simple_python`)
-* Go (`support/test/go/hello_world`)
+* Go (`support/test/go/hello_world` and `support/test/go/name-starts-with-vowel`)
 * Nodejs (`support/test/node/simple`)
 * Chrome (`support/test/chrome/`)
 * etc.
@ -524,13 +527,6 @@ Example:
        "${gadgetDir}/vscode-cpptools/debugAdapters/OpenDebugAD7"
      ],
      "name": "cppdbg"
-    },
-    "vscode-python": {
-      "command": [
-        "node",
-        "${gadgetDir}/vscode-python/out/client/debugger/debugAdapter/main.js"
-      ],
-      "name": "vscode-python"
    }
  }
 }
@ -656,18 +652,23 @@ personal and so you should work out what you like and use vim's powerful mapping
 features to set your own mappings. To that end, Vimspector defines the following
 `<Plug>` mappings:

-* `<Plug>VimspectorContinue`
-* `<Plug>VimspectorStop`
-* `<Plug>VimspectorRestart`
-* `<Plug>VimspectorPause`
-* `<Plug>VimspectorToggleBreakpoint`
-* `<Plug>VimspectorToggleConditionalBreakpoint`
-* `<Plug>VimspectorAddFunctionBreakpoint`
-* `<Plug>VimspectorStepOver`
-* `<Plug>VimspectorStepInto`
-* `<Plug>VimspectorStepOut`
-* `<Plug>VimspectorRunToCursor`
-* `<Plug>VimspectorBalloonEval`
+| Mapping                                       | Function                                                  | API                                                               |
+| ---                                           | ---                                                       | ---                                                               |
+| `<Plug>VimspectorContinue`                    | When debugging, continue. Otherwise start debugging.      | `vimspector#Continue()`                                           |
+| `<Plug>VimspectorStop`                        | Stop debugging.                                           | `vimspector#Stop()`                                               |
+| `<Plug>VimpectorRestart`                      | Restart debugging with the same configuration.            | `vimspector#Restart()`                                            |
+| `<Plug>VimspectorPause`                       | Pause debuggee.                                           | `vimspector#Pause()`                                              |
+| `<Plug>VimspectorToggleBreakpoint`            | Toggle line breakpoint on the current line.               | `vimspector#ToggleBreakpoint()`                                   |
+| `<Plug>VimspectorToggleConditionalBreakpoint` | Toggle conditional line breakpoint on the current line.   | `vimspector#ToggleBreakpoint( { trigger expr, hit count expr } )` |
+| `<Plug>VimspectorAddFunctionBreakpoint`       | Add a function breakpoint for the expression under cursor | `vimspector#AddFunctionBreakpoint( '<cexpr>' )`                   |
+| `<Plug>VimspectorRunToCursor`                 | Run to Cursor                                             | `vimspector#RunToCursor()`                                        |
+| `<Plug>VimspectorStepOver`                    | Step Over                                                 | `vimspector#StepOver()`                                           |
+| `<Plug>VimspectorStepInto`                    | Step Into                                                 | `vimspector#StepInto()`                                           |
+| `<Plug>VimspectorStepOut`                     | Step out of current function scope                        | `vimspector#StepOut()`                                            |
+| `<Plug>VimspectorUpFrame`                     | Move up a frame in the current call stack                 | `vimspector#UpFrame()`                                            |
+| `<Plug>VimspectorDownFrame`                   | Move down a frame in the current call stack               | `vimspector#DownFrame()`                                          |
+| `<Plug>VimspectorBalloonEval`                 | Evaluate expression under cursor (or visual) in popup     | *internal*                                                        |
+

 These map roughly 1-1 with the API functions below.

@ -695,17 +696,17 @@ loading vimspector**:
 let g:vimspector_enable_mappings = 'VISUAL_STUDIO'
 ```

-| Key               | Function                                                  | API |
-| ---               | ---                                                       | --- |
-| `F5`              | When debugging, continue. Otherwise start debugging.      | `vimspector#Continue()` |
-| `Shift F5`        | Stop debugging.                                           | `vimspector#Stop()` |
-| `Ctrl Shift F5`   | Restart debugging with the same configuration.            | `vimspector#Restart()` |
-| `F6`              | Pause debuggee.                                            | `vimspector#Pause()` |
-| `F9`              | Toggle line breakpoint on the current line.               | `vimspector#ToggleBreakpoint()` |
-| `Shift F9`        | Add a function breakpoint for the expression under cursor | `vimspector#AddFunctionBreakpoint( '<cexpr>' )` |
-| `F10`             | Step Over                                                 | `vimspector#StepOver()` |
-| `F11`             | Step Into                                                 | `vimspector#StepInto()` |
-| `Shift F11`       | Step out of current function scope                        | `vimspector#StepOut()` |
+| Key             | Mapping                                 | Function
+| ---             | ---                                     | ---
+| `F5`            | `<Plug>VimspectorContinue`              | When debugging, continue. Otherwise start debugging.
+| `Shift F5`      | `<Plug>VimspectorStop`                  | Stop debugging.
+| `Ctrl Shift F5` | `<Plug>VimspectorRestart`               | Restart debugging with the same configuration.
+| `F6`            | `<Plug>VimspectorPause`                 | Pause debuggee.
+| `F9`            | `<Plug>VimspectorToggleBreakpoint`      | Toggle line breakpoint on the current line.
+| `Shift F9`      | `<Plug>VimspectorAddFunctionBreakpoint` | Add a function breakpoint for the expression under cursor
+| `F10`           | `<Plug>VimspectorStepOver`              | Step Over
+| `F11`           | `<Plug>VimspectorStepInto`              | Step Into
+| `Shift F11`     | `<Plug>VimspectorStepOut`               | Step out of current function scope

 ## Human Mode

@ -720,19 +721,19 @@ loading vimspector**:
 let g:vimspector_enable_mappings = 'HUMAN'
 ```

-| Key          | Function                                                  | API                                                          |
-| ---          | ---                                                       | ---                                                          |
-| `F5`         | When debugging, continue. Otherwise start debugging.      | `vimspector#Continue()`                                      |
-| `F3`         | Stop debugging.                                           | `vimspector#Stop()`                                          |
-| `F4`         | Restart debugging with the same configuration.            | `vimspector#Restart()`                                       |
-| `F6`         | Pause debuggee.                                            | `vimspector#Pause()`                                         |
-| `F9`         | Toggle line breakpoint on the current line.               | `vimspector#ToggleBreakpoint()`                              |
-| `<leader>F9` | Toggle conditional line breakpoint on the current line.   | `vimspector#ToggleBreakpoint( { trigger expr, hit count expr } )` |
-| `F8`         | Add a function breakpoint for the expression under cursor | `vimspector#AddFunctionBreakpoint( '<cexpr>' )`              |
-| `<leader>F8` | Run to Cursor                                             | `vimspector#RunToCursor()`                                   |
-| `F10`        | Step Over                                                 | `vimspector#StepOver()`                                      |
-| `F11`        | Step Into                                                 | `vimspector#StepInto()`                                      |
-| `F12`        | Step out of current function scope                        | `vimspector#StepOut()`                                       |
+| Key          | Mapping                                       | Function
+| ---          | ---                                           | ---
+| `F5`         | `<Plug>VimspectorContinue`                    | When debugging, continue. Otherwise start debugging.
+| `F3`         | `<Plug>VimspectorStop`                        | Stop debugging.
+| `F4`         | `<Plug>VimspectorRestart`                     | Restart debugging with the same configuration.
+| `F6`         | `<Plug>VimspectorPause`                       | Pause debuggee.
+| `F9`         | `<Plug>VimspectorToggleBreakpoint`            | Toggle line breakpoint on the current line.
+| `<leader>F9` | `<Plug>VimspectorToggleConditionalBreakpoint` | Toggle conditional line breakpoint on the current line.
+| `F8`         | `<Plug>VimspectorAddFunctionBreakpoint`       | Add a function breakpoint for the expression under cursor
+| `<leader>F8` | `<Plug>VimspectorRunToCursor`                 | Run to Cursor
+| `F10`        | `<Plug>VimspectorStepOver`                    | Step Over
+| `F11`        | `<Plug>VimspectorStepInto`                    | Step Into
+| `F12`        | `<Plug>VimspectorStepOut`                     | Step out of current function scope

 In addition, I recommend adding a mapping to `<Plug>VimspectorBalloonEval`, in
 normal and visual modes, for example:
@ -746,6 +747,13 @@ nmap <Leader>di <Plug>VimspectorBalloonEval
 xmap <Leader>di <Plug>VimspectorBalloonEval
 ```

+You may also wish to add mappings for up/down the stack, for example:
+
+```viml
+nmap <LocalLeader><F11> <Plug>VimspectorUpFrame
+nmap <LocalLeader><F12> <Plug>VimspectorDownFrame
+```
+
 # Usage and API

 This section defines detailed usage instructions, organised by feature. For most
@ -1000,6 +1008,8 @@ be changed manually to "switch to" that thread.
  to set the "focussed" thread to the currently selected one. If the selected
  line is a stack frame, set the focussed thread to the thread of that frame and
  jump to that frame in the code window.
+* The current frame when a breakpoint is hit or if manuall jumping is also
+  highlighted.

 ![stack trace](https://puremourning.github.io/vimspector-web/img/vimspector-callstack-window.png)

@ -1061,6 +1071,8 @@ information when something goes wrong that's not a Vim traceback.
 If you just want to see the Vimspector log file, use `:VimspectorToggleLog`,
 which will tail it in a little window (doesn't work on Windows).

+You can see some debugging info with `:VimspectorDebugInfo`
+
 ## Closing debugger

 To close the debugger, use:
@ -1165,6 +1177,38 @@ 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
@ -1250,10 +1294,6 @@ Rust is supported with any gdb/lldb-based debugger. So it works fine with
  headers/libs to build a C python extension for performance.
 * Full options: https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings

-
-**Migrating from `vscode-python`**: change `"adapter": "vscode-python"` to
-`"adapter": "debugpy"`.
-
 ```json
 {
  "configurations": {
@ -1320,34 +1360,6 @@ debugpy](https://github.com/microsoft/debugpy/wiki/Debugging-over-SSH).
 If you're feeling fancy, checkout the [reference guide][remote-debugging] for
 an example of getting Vimspector to remotely launch and attach.

-### Legacy: vscode-python
-
-* No longer installed by default - please pass `--force-enable-python.legacy` if
-  you just want to continue using your working setup.
-* [vscode-python](https://github.com/Microsoft/vscode-python)
-* NOTE: You must be running `node` 10. See [this issue](https://github.com/puremourning/vimspector/issues/105)
-
-```json
-{
-  "configurations": {
-    "<name>: Launch": {
-      "adapter": "vscode-python",
-      "configuration": {
-        "name": "<name>: Launch",
-        "type": "python",
-        "request": "launch",
-        "cwd": "<working directory>",
-        "stopOnEntry": true,
-        "console": "externalTerminal",
-        "debugOptions": [],
-        "program": "<path to main python file>"
-      }
-    }
-    ...
-  }
-}
-```
-
 ## TCL

 * TCL (TclProDebug)
@ -1371,35 +1383,8 @@ netcoredbg`
        "program": "${workspaceRoot}/bin/Debug/netcoreapp2.2/csharp.dll",
        "args": [],
        "stopAtEntry": true,
-        "cwd": "${workspaceRoot}"
-      }
-    }
-  }
-}
-```
-
-* C# - mono
-
-Install with `install_gadget.py --force-enable-csharp` or `:VimspectorInstall
-vscode-mono-debug`.
-
-***Known not to work.***
-
-```json
-{
-  "configurations": {
-    "launch - mono": {
-      "adapter": "vscode-mono-debug",
-      "configuration": {
-        "request": "launch",
-        "program": "${workspaceRoot}/bin/Debug/netcoreapp2.2/csharp.dll",
-        "args": [],
        "cwd": "${workspaceRoot}",
-        "runtimeExecutable": "mono",
-        "runtimeArgs": [],
-        "env": [],
-        "externalConsole": false,
-        "console": "integratedTerminal"
+        "env": {}
      }
    }
  }
@ -1416,6 +1401,8 @@ 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": {
@ -1433,7 +1420,7 @@ Requires:
 ```

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

 ## PHP

@ -1579,6 +1566,20 @@ editor plugin to use Java. I recommend [YouCompleteMe][], which has full support
 for jdt.ls, and most importantly a trivial way to load the debug adapter and to
 use it with Vimspector.

+### Hot code replace
+
+When using the [java debug server][java-debug-server], Vimspector supports the
+hot code replace custom feature. By default, when the underlying class files
+change, vimspector asks the user if they wish to reload these classes at
+runtime.
+
+This behaviour can be customised:
+
+* `let g:ycm_java_hotcodereplace_mode = 'ask'` - the default, ask the user for
+  each reload.
+* `let g:ycm_java_hotcodereplace_mode = 'always'` - don't ask, always reload
+* `let g:ycm_java_hotcodereplace_mode = 'never'` - don't ask, never reload
+
 ### Usage with YouCompleteMe

 * Set up [YCM for java][YcmJava].
@ -1738,22 +1739,26 @@ Vimsector uses them, they will not be replaced. So to customise the signs,
 define them in your `vimrc`.


-| Sign                   | Description                         | Priority |
-|------------------------|-------------------------------------|----------|
-| `vimspectorBP`         | Line breakpoint                     | 9        |
-| `vimspectorBPCond`     | Conditional line breakpoint         | 9        |
-| `vimspectorBPDisabled` | Disabled breakpoint                 | 9        |
-| `vimspectorPC`         | Program counter (i.e. current line) | 200      |
-| `vimspectorPCBP`       | Program counter and breakpoint      | 200      |
+| Sign                      | Description                             | Priority |
+|---------------------------|-----------------------------------------|----------|
+| `vimspectorBP`            | Line breakpoint                         | 9        |
+| `vimspectorBPCond`        | Conditional line breakpoint             | 9        |
+| `vimspectorBPDisabled`    | Disabled breakpoint                     | 9        |
+| `vimspectorPC`            | Program counter (i.e. current line)     | 200      |
+| `vimspectorPCBP`          | Program counter and breakpoint          | 200      |
+| `vimspectorCurrentThread` | Focussed thread in stack trace view     | 200      |
+| `vimspectorCurrentFrame`  | Current stack frame in stack trace view | 200      |

 The default symbols are the equivalent of something like the following:

 ```viml
-sign define vimspectorBP         text=\ ● texthl=WarningMsg
-sign define vimspectorBPCond     text=\ ◆ texthl=WarningMsg
-sign define vimspectorBPDisabled text=\ ● texthl=LineNr
-sign define vimspectorPC         text=\ ▶ texthl=MatchParen linehl=CursorLine
-sign define vimspectorPCBP       text=●▶  texthl=MatchParen linehl=CursorLine
+sign define vimspectorBP            text=\ ● texthl=WarningMsg
+sign define vimspectorBPCond        text=\ ◆ texthl=WarningMsg
+sign define vimspectorBPDisabled    text=\ ● texthl=LineNr
+sign define vimspectorPC            text=\ ▶ texthl=MatchParen linehl=CursorLine
+sign define vimspectorPCBP          text=●▶  texthl=MatchParen linehl=CursorLine
+sign define vimspectorCurrentThread text=▶   texthl=MatchParen linehl=CursorLine
+sign define vimspectorCurrentFrame  text=▶   texthl=Special    linehl=CursorLine
 ```

 If the signs don't display properly, your font probably doesn't contain these
@ -1761,11 +1766,13 @@ glyphs. You can easily change them by defining the sign in your vimrc. For
 example, you could put this in your `vimrc` to use some simple ASCII symbols:

 ```viml
-sign define vimspectorBP text=o          texthl=WarningMsg
-sign define vimspectorBPCond text=o?     texthl=WarningMsg
-sign define vimspectorBPDisabled text=o! texthl=LineNr
-sign define vimspectorPC text=\ >        texthl=MatchParen
-sign define vimspectorPCBP text=o>       texthl=MatchParen
+sign define vimspectorBP text=o             texthl=WarningMsg
+sign define vimspectorBPCond text=o?        texthl=WarningMsg
+sign define vimspectorBPDisabled text=o!    texthl=LineNr
+sign define vimspectorPC text=\ >           texthl=MatchParen
+sign define vimspectorPCBP text=o>          texthl=MatchParen
+sign define vimspectorCurrentThread text=>  texthl=MatchParen
+sign define vimspectorCurrentFrame text=>   texthl=Special
 ```

 ## Sign priority
@ -2042,6 +2049,10 @@ hi link jsonComment Comment
   Debug adapters (for some reason) send telemetry data to clients. Vimspector simply
   displays this information in the output window. It *does not* and *will not ever*
   collect, use, forward or otherwise share any data with any third parties.
+10. Do I _have_ to put a `.vimspector.json` in the root of every project? No, you
+    can put all of your adapter and debug configs in a [single directory](https://puremourning.github.io/vimspector/configuration.html#debug-configurations) if you want to, but note
+    the caveat that `${workspaceRoot}` won't be calculated correctly in that case.
+    The vimsepctor author uses this [a lot](https://github.com/puremourning/.vim-mac/tree/master/vimspector-conf).


 [ycmd]: https://github.com/Valloric/ycmd
--- a/autoload/vimspector.vim
+++ b/autoload/vimspector.vim
@ -13,6 +13,9 @@
 " See the License for the specific language governing permissions and
 " limitations under the License.

+if !has( 'python3' )
+  finish
+endif

 " Boilerplate {{{
 let s:save_cpo = &cpoptions
@ -41,11 +44,11 @@ function! s:Enabled() abort
  return s:enabled
 endfunction

-function! vimspector#Launch() abort
+function! vimspector#Launch( ... ) abort
  if !s:Enabled()
    return
  endif
-  py3 _vimspector_session.Start()
+  py3 _vimspector_session.Start( *vim.eval( 'a:000' ) )
 endfunction

 function! vimspector#LaunchWithSettings( settings ) abort
@ -234,6 +237,20 @@ function! vimspector#GoToFrame() abort
  py3 _vimspector_session.ExpandFrameOrThread()
 endfunction

+function! vimspector#UpFrame() abort
+  if !s:Enabled()
+    return
+  endif
+  py3 _vimspector_session.UpFrame()
+endfunction
+
+function! vimspector#DownFrame() abort
+  if !s:Enabled()
+    return
+  endif
+  py3 _vimspector_session.DownFrame()
+endfunction
+
 function! vimspector#AddWatch( ... ) abort
  if !s:Enabled()
    return
@ -540,6 +557,14 @@ function! vimspector#ShowEvalBalloon( is_visual ) abort
                \ . '", 0 )' )
 endfunction

+function! vimspector#PrintDebugInfo() abort
+  if !s:Enabled()
+    return
+  endif
+
+  py3 _vimspector_session.PrintDebugInfo()
+endfunction
+

 " Boilerplate {{{
 let &cpoptions=s:save_cpo
--- a/autoload/vimspector/internal/balloon.vim
+++ b/autoload/vimspector/internal/balloon.vim
@ -69,14 +69,9 @@ function! vimspector#internal#balloon#CreateTooltip( is_hover, ... ) abort
      \ 'resize': 1,
      \ 'close': 'button',
      \ 'callback': 'vimspector#internal#balloon#CloseCallback',
-      \ 'mapping': 0
      \ }

-    " When ambiwidth is single, use prettier characters for the border. This
-    " would look silly when ambiwidth is double.
-    if &ambiwidth ==# 'single' && &encoding ==? 'utf-8'
-      let config[ 'borderchars' ] = [ '─', '│', '─', '│', '╭', '╮', '┛', '╰' ]
-    endif
+    let config = vimspector#internal#popup#SetBorderChars( config )

    if a:is_hover
      let config[ 'filter' ] = 'vimspector#internal#balloon#MouseFilter'
@ -86,6 +81,7 @@ function! vimspector#internal#balloon#CreateTooltip( is_hover, ... ) abort
      let config[ 'filter' ] = 'vimspector#internal#balloon#CursorFilter'
      let config[ 'moved' ] = 'any'
      let config[ 'cursorline' ] = 1
+      let config[ 'mapping' ] = 0
      let s:popup_win_id = popup_atcursor( body, config )
    endif

--- a/autoload/vimspector/internal/neojob.vim
+++ b/autoload/vimspector/internal/neojob.vim
@ -159,15 +159,16 @@ function! s:_OnCommandEvent( category, id, data, event ) abort
      call setbufvar( buffer, '&modified', 0 )
    endtry

-    " if the buffer is visible, scroll it
+    " if the buffer is visible, scroll it, but don't allow autocommands to fire,
+    " as this may close the current window!
    let w = bufwinnr( buffer )
    if w > 0
      let cw = winnr()
      try
-        execute w . 'wincmd w'
-        normal! Gz-
+        noautocmd execute w . 'wincmd w'
+        noautocmd normal! Gz-
      finally
-        execute cw . 'wincmd w'
+        noautocmd execute cw . 'wincmd w'
      endtry
    endif
  elseif a:event ==# 'exit'
--- a/autoload/vimspector/internal/neopopup.vim
+++ b/autoload/vimspector/internal/neopopup.vim
@ -80,6 +80,56 @@ function! vimspector#internal#neopopup#HideSplash( id ) abort
  unlet s:db[ a:id ]
 endfunction

+function! vimspector#internal#neopopup#Confirm( confirm_id,
+                                              \ text,
+                                              \ options,
+                                              \ default_value,
+                                              \ keys ) abort
+
+  " Neovim doesn't have an equivalent of popup_dialog, and it's way too much
+  " effort to write one, so we just use confirm()...
+  " Annoyingly we can't use confirm() here because for some reason it doesn't
+  " render properly in a channel callback. So we use input() and mimic dialog
+  " behaviour.
+  let prompt = a:text
+  for opt in a:options
+    let prompt .= ' ' . opt
+  endfor
+  let prompt .= ': '
+
+  try
+    let result = input( prompt, a:keys[ a:default_value - 1 ] )
+  catch /.*/
+    let result = -1
+  endtry
+
+  " Map the results to what the vim popup stuff would return (s:ConfirmCallback
+  " in popup.vim), i.e.:
+  "  - 1-based index of selected item, or
+  "  - -1 or 0 for cancellation
+  if result == ''
+    " User pressed ESC/ctrl-c
+    let result = -1
+  else
+    let index = 1
+    for k in a:keys
+      if k ==? result
+        let result = index
+        break
+      endif
+      let index += 1
+    endfor
+
+    if index > len( a:keys )
+      let result = -1
+    endif
+  endif
+
+  py3 __import__( 'vimspector', fromlist = [ 'utils' ] ).utils.ConfirmCallback(
+        \ int( vim.eval( 'a:confirm_id' ) ),
+        \ int( vim.eval( 'result' ) ) )
+endfunction
+
 " Boilerplate {{{
 let &cpoptions=s:save_cpo
 unlet s:save_cpo
--- a/autoload/vimspector/internal/popup.vim
+++ b/autoload/vimspector/internal/popup.vim
@ -12,6 +12,7 @@
 " WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 " See the License for the specific language governing permissions and
 " limitations under the License.
+scriptencoding utf-8


 " Boilerplate {{{
@ -32,6 +33,113 @@ function! vimspector#internal#popup#HideSplash( id ) abort
  call popup_hide( a:id )
 endfunction

+let s:current_selection = 0
+let s:selections = []
+let s:text = []
+
+function! s:UpdatePopup( id ) abort
+  let buf = copy( s:text )
+  call extend( buf, s:DrawButtons() )
+  call popup_settext( a:id, buf )
+endfunction
+
+function! s:ConfirmKeyFilter( keys, id, key ) abort
+  if a:key ==# "\<CR>"
+    call popup_close( a:id, s:current_selection + 1 )
+    return 1
+  elseif index( [ "\<Tab>", "\<Right>" ], a:key ) >= 0
+    let s:current_selection = ( s:current_selection + 1 ) % len( s:selections )
+    call s:UpdatePopup( a:id )
+    return 1
+  elseif index( [ "\<S-Tab>", "\<Left>" ], a:key ) >= 0
+    let s:current_selection = s:current_selection == 0
+          \ ? len( s:selections ) - 1: s:current_selection - 1
+    call s:UpdatePopup( a:id )
+    return 1
+  elseif a:key ==# "\<Esc>" || a:key ==# "\<C-c>"
+    call popup_close( a:id, -1 )
+    return 1
+  endif
+
+  let index = 1
+  for key in a:keys
+    if a:key ==? key
+      call popup_close( a:id, index )
+      return 1
+    endif
+    let index += 1
+  endfor
+endfunction
+
+function! s:ConfirmCallback( confirm_id, id, result ) abort
+  py3 __import__( 'vimspector', fromlist = [ 'utils' ] ).utils.ConfirmCallback(
+        \ int( vim.eval( 'a:confirm_id' ) ),
+        \ int( vim.eval( 'a:result' ) ) )
+endfunction
+
+function! s:SelectionPosition( idx ) abort
+  return a:idx == 0 ? 0 : len( join( s:selections[ : a:idx - 1 ], ' ' ) ) + 1
+endfunction
+
+function! s:DrawButtons() abort
+  return [ {
+        \ 'text': join( s:selections, ' ' ),
+        \ 'props': [
+          \   {
+          \      'col': s:SelectionPosition( s:current_selection ) + 1,
+          \      'length': len( s:selections[ s:current_selection ] ),
+          \      'type': 'VimspectorSelectedItem'
+          \   },
+          \ ]
+        \ } ]
+endfunction
+
+function! vimspector#internal#popup#Confirm(
+      \ confirm_id,
+      \ text,
+      \ options,
+      \ default_value,
+      \ keys ) abort
+
+  silent! call prop_type_add( 'VimspectorSelectedItem', {
+        \ 'highlight': 'PMenuSel'
+        \ } )
+
+  let lines = split( a:text, "\n", v:true )
+  let buf = []
+  for line in lines
+    call add( buf, { 'text': line, 'props': [] } )
+  endfor
+
+  call add( buf, { 'text': '', 'props': [] } )
+
+  let s:selections = a:options
+  let s:current_selection = ( a:default_value - 1 )
+
+  let s:text = copy( buf )
+  call extend( buf, s:DrawButtons() )
+
+  let config = {
+        \   'callback': function( 's:ConfirmCallback', [ a:confirm_id ] ),
+        \   'filter': function( 's:ConfirmKeyFilter', [ a:keys ] ),
+        \   'mapping': v:false,
+        \ }
+  let config = vimspector#internal#popup#SetBorderChars( config )
+
+  return popup_dialog( buf, config  )
+endfunction
+
+function! vimspector#internal#popup#SetBorderChars( config ) abort
+  " When ambiwidth is single, use prettier characters for the border. This
+  " would look silly when ambiwidth is double.
+  if &ambiwidth ==# 'single' && &encoding ==? 'utf-8'
+    let a:config[ 'borderchars' ] = [ '─', '│', '─', '│', '╭', '╮', '┛', '╰' ]
+  endif
+
+  return a:config
+endfunction
+
+
 " Boilerplate {{{
 let &cpoptions=s:save_cpo
 unlet s:save_cpo
--- a/doc/vimspector-ref.txt
+++ b/doc/vimspector-ref.txt
--- a/doc/vimspector.txt
+++ b/doc/vimspector.txt
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@ -1,13 +1,13 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (6.0.3.4)
+    activesupport (6.0.3.6)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
    coffee-script (2.4.1)
      coffee-script-source
@ -16,7 +16,7 @@ GEM
    colorator (1.1.0)
    commonmarker (0.17.13)
      ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
    dnsruby (1.61.5)
      simpleidn (~> 0.1)
    em-websocket (0.5.2)
@ -30,12 +30,12 @@ GEM
      faraday-net_http (~> 1.0)
      multipart-post (>= 1.2, < 3)
      ruby2_keywords
-    faraday-net_http (1.0.0)
-    ffi (1.14.2)
+    faraday-net_http (1.0.1)
+    ffi (1.15.0)
    forwardable-extended (2.6.0)
    gemoji (3.0.1)
-    github-pages (209)
-      github-pages-health-check (= 1.16.1)
+    github-pages (214)
+      github-pages-health-check (= 1.17.0)
      jekyll (= 3.9.0)
      jekyll-avatar (= 0.7.0)
      jekyll-coffeescript (= 1.1.1)
@ -50,9 +50,9 @@ GEM
      jekyll-readme-index (= 0.3.0)
      jekyll-redirect-from (= 0.16.0)
      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.2)
+      jekyll-remote-theme (= 0.4.3)
      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.6.1)
+      jekyll-seo-tag (= 2.7.1)
      jekyll-sitemap (= 1.4.0)
      jekyll-swiss (= 1.0.0)
      jekyll-theme-architect (= 0.1.1)
@ -70,19 +70,19 @@ GEM
      jekyll-theme-time-machine (= 0.1.1)
      jekyll-titles-from-headings (= 0.5.3)
      jemoji (= 0.12.0)
-      kramdown (= 2.3.0)
+      kramdown (= 2.3.1)
      kramdown-parser-gfm (= 1.1.0)
      liquid (= 4.0.3)
      mercenary (~> 0.3)
      minima (= 2.5.1)
      nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.23.0)
+      rouge (= 3.26.0)
      terminal-table (~> 1.4)
-    github-pages-health-check (1.16.1)
+    github-pages-health-check (1.17.0)
      addressable (~> 2.3)
      dnsruby (~> 1.60)
      octokit (~> 4.0)
-      public_suffix (~> 3.0)
+      public_suffix (>= 2.0.2, < 5.0)
      typhoeus (~> 1.3)
    html-pipeline (2.14.0)
      activesupport (>= 2)
@ -136,15 +136,15 @@ GEM
      jekyll (>= 3.3, < 5.0)
    jekyll-relative-links (0.6.1)
      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.2)
+    jekyll-remote-theme (0.4.3)
      addressable (~> 2.0)
      jekyll (>= 3.5, < 5.0)
      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
      rubyzip (>= 1.3.0, < 3.0)
    jekyll-sass-converter (1.5.2)
      sass (~> 3.4)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
+    jekyll-seo-tag (2.7.1)
+      jekyll (>= 3.8, < 5.0)
    jekyll-sitemap (1.4.0)
      jekyll (>= 3.7, < 5.0)
    jekyll-swiss (1.0.0)
@ -196,23 +196,23 @@ GEM
      gemoji (~> 3.0)
      html-pipeline (~> 2.2)
      jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.0)
+    kramdown (2.3.1)
      rexml
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
    liquid (4.0.3)
-    listen (3.4.0)
+    listen (3.5.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.3.6)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.5.1)
    minima (2.5.1)
      jekyll (>= 3.5, < 5.0)
      jekyll-feed (~> 0.9)
      jekyll-seo-tag (~> 2.1)
-    minitest (5.14.3)
+    minitest (5.14.4)
    multipart-post (2.1.1)
-    nokogiri (1.11.1)
+    nokogiri (1.11.5)
      mini_portile2 (~> 2.5.0)
      racc (~> 1.4)
    octokit (4.20.0)
@ -220,16 +220,16 @@ GEM
      sawyer (~> 0.8.0, >= 0.5.3)
    pathutil (0.16.2)
      forwardable-extended (~> 2.6)
-    public_suffix (3.1.1)
+    public_suffix (4.0.6)
    racc (1.5.2)
    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.23.0)
-    ruby-enum (0.8.0)
+    rexml (3.2.5)
+    rouge (3.26.0)
+    ruby-enum (0.9.0)
      i18n
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
    rubyzip (2.3.0)
    safe_yaml (1.0.5)
    sass (3.7.4)
@ -240,7 +240,7 @@ GEM
    sawyer (0.8.2)
      addressable (>= 2.3.5)
      faraday (> 0.8, < 2.0)
-    simpleidn (0.1.1)
+    simpleidn (0.2.1)
      unf (~> 0.1.4)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
--- a/docs/configuration.md
+++ b/docs/configuration.md
@ -271,7 +271,7 @@ JSON value `true`, and the suffix is stripped fom the key, resulting in the
 following:

 ```json
-  "stopOnEntry#json": true
+  "stopOnEntry": true
 ```

 Which is what we need.
@ -722,7 +722,7 @@ Vimspector then orchestrates the various tools to set you up.
      "variables": {
        // Just an example of how to specify a variable manually rather than
        // vimspector asking for input from the user
-        "ServiceName": "${fileBasenameNoExtention}"
+        "ServiceName": "${fileBasenameNoExtension}"
      },

      "adapter": "python-remote",
--- a/plugin/vimspector.vim
+++ b/plugin/vimspector.vim
@ -13,6 +13,13 @@
 " See the License for the specific language governing permissions and
 " limitations under the License.

+if !has( 'python3' )
+  echohl WarningMsg
+  echom 'Vimspector unavailable: Requires Vim compiled with +python3'
+  echohl None
+  finish
+endif
+
 " Boilerplate {{{
 let s:save_cpo = &cpoptions
 set cpoptions&vim
@ -35,6 +42,8 @@ let s:mappings = get( g:, 'vimspector_enable_mappings', '' )

 nnoremap <silent> <Plug>VimspectorContinue
      \ :<c-u>call vimspector#Continue()<CR>
+nnoremap <silent> <Plug>VimspectorLaunch
+      \ :<c-u>call vimspector#Launch( v:true )<CR>
 nnoremap <silent> <Plug>VimspectorStop
      \ :<c-u>call vimspector#Stop()<CR>
 nnoremap <silent> <Plug>VimspectorRestart
@ -67,6 +76,11 @@ nnoremap <silent> <Plug>VimspectorBalloonEval
 xnoremap <silent> <Plug>VimspectorBalloonEval
      \ :<c-u>call vimspector#ShowEvalBalloon( 1 )<CR>

+nnoremap <silent> <Plug>VimspectorUpFrame
+      \ :<c-u>call vimspector#UpFrame()<CR>
+nnoremap <silent> <Plug>VimspectorDownFrame
+      \ :<c-u>call vimspector#DownFrame()<CR>
+
 if s:mappings ==# 'VISUAL_STUDIO'
  nmap <F5>         <Plug>VimspectorContinue
  nmap <S-F5>       <Plug>VimspectorStop
@ -79,6 +93,7 @@ if s:mappings ==# 'VISUAL_STUDIO'
  nmap <S-F11>      <Plug>VimspectorStepOut
 elseif s:mappings ==# 'HUMAN'
  nmap <F5>         <Plug>VimspectorContinue
+  nmap <leader><F5> <Plug>VimspectorLaunch
  nmap <F3>         <Plug>VimspectorStop
  nmap <F4>         <Plug>VimspectorRestart
  nmap <F6>         <Plug>VimspectorPause
@ -100,6 +115,9 @@ command! -bar -nargs=? -complete=custom,vimspector#CompleteOutput
 command! -bar
      \ VimspectorToggleLog
      \ call vimspector#ToggleLog()
+command! -bar
+      \ VimspectorDebugInfo
+      \ call vimspector#PrintDebugInfo()
 command! -nargs=1 -complete=custom,vimspector#CompleteExpr
      \ VimspectorEval
      \ call vimspector#Evaluate( <f-args> )
--- a/python3/vimspector/custom/java.py
+++ b/python3/vimspector/custom/java.py
@ -0,0 +1,51 @@
+# vimspector - A multi-language debugging system for Vim
+# Copyright 2021 Ben Jackson
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from vimspector.debug_session import DebugSession
+from vimspector import utils, settings
+
+
+class JavaDebugAdapter( object ):
+  def __init__( self, debug_session: DebugSession ):
+    self.debug_session = debug_session
+
+  def OnEvent_hotcodereplace( self, message ):
+    # Hack for java debug server hot-code-replace
+    body = message.get( 'body' ) or {}
+
+    if body.get( 'type' ) != 'hotcodereplace':
+      return
+
+    if body.get( 'changeType' ) == 'BUILD_COMPLETE':
+      def handler( result ):
+        if result == 1:
+          self.debug_session._connection.DoRequest( None, {
+            'command': 'redefineClasses',
+            'arguments': {},
+          } )
+
+      mode = settings.Get( 'java_hotcodereplace_mode' )
+      if mode == 'ask':
+        utils.Confirm( self.debug_session._api_prefix,
+                       'Code has changed, hot reload?',
+                       handler,
+                       default_value = 1 )
+      elif mode == 'always':
+        self.debug_session._connection.DoRequest( None, {
+          'command': 'redefineClasses',
+          'arguments': {},
+        } )
+    elif body.get( 'message' ):
+      utils.UserMessage( 'Hot code replace: ' + body[ 'message' ] )
--- a/python3/vimspector/debug_adapter_connection.py
+++ b/python3/vimspector/debug_adapter_connection.py
@ -29,14 +29,14 @@ class PendingRequest( object ):


 class DebugAdapterConnection( object ):
-  def __init__( self, handler, send_func ):
+  def __init__( self, handlers, send_func ):
    self._logger = logging.getLogger( __name__ )
    utils.SetUpLogging( self._logger )

    self._Write = send_func
    self._SetState( 'READ_HEADER' )
    self._buffer = bytes()
-    self._handler = handler
+    self._handlers = handlers
    self._next_message_id = 0
    self._outstanding_requests = {}

@ -124,7 +124,7 @@ class DebugAdapterConnection( object ):

  def Reset( self ):
    self._Write = None
-    self._handler = None
+    self._handlers = None

    while self._outstanding_requests:
      _, request = self._outstanding_requests.popitem()
@ -226,7 +226,12 @@ class DebugAdapterConnection( object ):

    # self._logger.debug( 'Message received (raw): %s', payload )

-    message = json.loads( payload )
+    try:
+      message = json.loads( payload, strict = False )
+    except Exception:
+      self._logger.exception( "Invalid message received: %s", payload )
+      self._SetState( 'READ_HEADER' )
+      raise

    self._logger.debug( 'Message received: {0}'.format( message ) )

@ -237,7 +242,7 @@ class DebugAdapterConnection( object ):


  def _OnMessageReceived( self, message ):
-    if not self._handler:
+    if not self._handlers:
      return

    if message[ 'type' ] == 'response':
@ -270,25 +275,21 @@ class DebugAdapterConnection( object ):
        self._logger.error( 'Request failed: {0}'.format( reason ) )
        if request.failure_handler:
          request.failure_handler( reason, message )
-        elif 'OnFailure' in dir( self._handler ):
-          self._handler.OnFailure( reason, request.msg, message )
        else:
-          utils.UserMessage( 'Request failed: {0}'.format( reason ) )
+          for h in self._handlers:
+            if 'OnFailure' in dir( h ):
+              h.OnFailure( reason, request.msg, message )
+
    elif message[ 'type' ] == 'event':
      method = 'OnEvent_' + message[ 'event' ]
-      if method in dir( self._handler ):
-        getattr( self._handler, method )( message )
-      else:
-        utils.UserMessage( 'Unhandled event: {0}'.format( message[ 'event' ] ),
-                           persist = True )
+      for h in self._handlers:
+        if method in dir( h ):
+          getattr( h, method )( message )
    elif message[ 'type' ] == 'request':
      method = 'OnRequest_' + message[ 'command' ]
-      if method in dir( self._handler ):
-        getattr( self._handler, method )( message )
-      else:
-        utils.UserMessage(
-          'Unhandled request: {0}'.format( message[ 'command' ] ),
-          persist = True )
+      for h in self._handlers:
+        if method in dir( h ):
+          getattr( h, method )( message )


 def _KillTimer( request ):
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@ -21,6 +21,7 @@ import shlex
 import subprocess
 import functools
 import vim
+import importlib

 from vimspector import ( breakpoints,
                         code,
@ -99,7 +100,7 @@ class DebugSession( object ):

    return launch_config_file, configurations

-  def Start( self, launch_variables = None ):
+  def Start( self, force_choose=False, launch_variables = None ):
    # We mutate launch_variables, so don't mutate the default argument.
    # https://docs.python-guide.org/writing/gotchas/#mutable-default-arguments
    if launch_variables is None:
@ -134,6 +135,11 @@ class DebugSession( object ):

    if 'configuration' in launch_variables:
      configuration_name = launch_variables.pop( 'configuration' )
+    elif force_choose:
+      # Always display the menu
+      configuration_name = utils.SelectFromList(
+        'Which launch configuration?',
+        sorted( configurations.keys() ) )
    elif ( len( configurations ) == 1 and
           next( iter( configurations.values() ) ).get( "autoselect", True ) ):
      configuration_name = next( iter( configurations.keys() ) )
@ -571,6 +577,14 @@ class DebugSession( object ):
  def ExpandFrameOrThread( self ):
    self._stackTraceView.ExpandFrameOrThread()

+  @IfConnected()
+  def UpFrame( self ):
+    self._stackTraceView.UpFrame()
+
+  @IfConnected()
+  def DownFrame( self ):
+    self._stackTraceView.DownFrame()
+
  def ToggleLog( self ):
    if self._HasUI():
      return self.ShowOutput( 'Vimspector' )
@ -655,6 +669,45 @@ class DebugSession( object ):
    vim.command( 'tab split' )
    self._uiTab = vim.current.tabpage

+    mode = settings.Get( 'ui_mode' )
+
+    if mode == 'auto':
+      # Go vertical if there isn't enough horizontal space for at least:
+      #  the left bar width
+      #  + the code min width
+      #  + the terminal min width
+      #  + enough space for a sign column and number column?
+      min_width = ( settings.Int( 'sidebar_width' )
+                    + 1 + 2 + 3
+                    + settings.Int( 'code_minwidth' )
+                    + 1 + settings.Int( 'terminal_minwidth' ) )
+
+      min_height = ( settings.Int( 'code_minheight' ) + 1 +
+                     settings.Int( 'topbar_height' ) + 1 +
+                     settings.Int( 'bottombar_height' ) + 1 +
+                     2 )
+
+      mode = ( 'vertical'
+               if vim.options[ 'columns' ] < min_width
+               else 'horizontal' )
+
+      if vim.options[ 'lines' ] < min_height:
+        mode = 'horizontal'
+
+      self._logger.debug( 'min_width/height: %s/%s, actual: %s/%s - result: %s',
+                          min_width,
+                          min_height,
+                          vim.options[ 'columns' ],
+                          vim.options[ 'lines' ],
+                          mode )
+
+    if mode == 'vertical':
+      self._SetUpUIVertical()
+    else:
+      self._SetUpUIHorizontal()
+
+
+  def _SetUpUIHorizontal( self ):
    # Code window
    code_window = vim.current.window
    self._codeView = code.CodeView( code_window, self._api_prefix )
@ -695,6 +748,66 @@ class DebugSession( object ):
    # TODO: If/when we support multiple sessions, we'll need some way to
    # indicate which tab was created and store all the tabs
    vim.vars[ 'vimspector_session_windows' ] = {
+      'mode': 'horizontal',
+      'tabpage': self._uiTab.number,
+      'code': utils.WindowID( code_window, self._uiTab ),
+      'stack_trace': utils.WindowID( stack_trace_window, self._uiTab ),
+      'variables': utils.WindowID( vars_window, self._uiTab ),
+      'watches': utils.WindowID( watch_window, self._uiTab ),
+      'output': utils.WindowID( output_window, self._uiTab ),
+      'eval': None # this is going to be updated every time eval popup is opened
+    }
+    with utils.RestoreCursorPosition():
+      with utils.RestoreCurrentWindow():
+        with utils.RestoreCurrentBuffer( vim.current.window ):
+          vim.command( 'doautocmd User VimspectorUICreated' )
+
+
+  def _SetUpUIVertical( self ):
+    # Code window
+    code_window = vim.current.window
+    self._codeView = code.CodeView( code_window, self._api_prefix )
+
+    # Call stack
+    vim.command(
+      f'topleft { settings.Int( "topbar_height" ) }new' )
+    stack_trace_window = vim.current.window
+    one_third = int( vim.eval( 'winwidth( 0 )' ) ) / 3
+    self._stackTraceView = stack_trace.StackTraceView( self,
+                                                       stack_trace_window )
+
+
+    # Watches
+    vim.command( 'leftabove vertical new' )
+    watch_window = vim.current.window
+
+    # Variables
+    vim.command( 'leftabove vertical new' )
+    vars_window = vim.current.window
+
+
+    with utils.LetCurrentWindow( vars_window ):
+      vim.command( f'{ one_third }wincmd |' )
+    with utils.LetCurrentWindow( watch_window ):
+      vim.command( f'{ one_third }wincmd |' )
+    with utils.LetCurrentWindow( stack_trace_window ):
+      vim.command( f'{ one_third }wincmd |' )
+
+    self._variablesView = variables.VariablesView( vars_window,
+                                                   watch_window )
+
+
+    # Output/logging
+    vim.current.window = code_window
+    vim.command( f'rightbelow { settings.Int( "bottombar_height" ) }new' )
+    output_window = vim.current.window
+    self._outputView = output.DAPOutputView( output_window,
+                                             self._api_prefix )
+
+    # TODO: If/when we support multiple sessions, we'll need some way to
+    # indicate which tab was created and store all the tabs
+    vim.vars[ 'vimspector_session_windows' ] = {
+      'mode': 'vertical',
      'tabpage': self._uiTab.number,
      'code': utils.WindowID( code_window, self._uiTab ),
      'stack_trace': utils.WindowID( stack_trace_window, self._uiTab ),
@ -781,8 +894,21 @@ class DebugSession( object ):
                                                 self._splash_screen,
                                                 "Unable to start adapter" )
    else:
+      if 'custom_handler' in self._adapter:
+        spec = self._adapter[ 'custom_handler' ]
+        if isinstance( spec, dict ):
+          module = spec[ 'module' ]
+          cls = spec[ 'class' ]
+        else:
+          module, cls = spec.rsplit( '.', 1 )
+
+        CustomHandler = getattr( importlib.import_module( module ), cls )
+        handlers = [ CustomHandler( self ), self ]
+      else:
+        handlers = [ self ]
+
      self._connection = debug_adapter_connection.DebugAdapterConnection(
-        self,
+        handlers,
        lambda msg: utils.Call(
          "vimspector#internal#{}#Send".format( self._connection_type ),
          msg ) )
@ -790,39 +916,58 @@ class DebugSession( object ):
    self._logger.info( 'Debug Adapter Started' )

  def _StopDebugAdapter( self, interactive = False, callback = None ):
-    self._splash_screen = utils.DisplaySplash(
-      self._api_prefix,
-      self._splash_screen,
-      "Shutting down debug adapter..." )
-
-    def handler( *args ):
-      self._splash_screen = utils.HideSplash( self._api_prefix,
-                                              self._splash_screen )
-
-      if callback:
-        self._logger.debug( "Setting server exit handler before disconnect" )
-        assert not self._run_on_server_exit
-        self._run_on_server_exit = callback
-
-      vim.eval( 'vimspector#internal#{}#StopDebugSession()'.format(
-        self._connection_type ) )
-
    arguments = {}
-    if ( interactive and
-         self._server_capabilities.get( 'supportTerminateDebuggee' ) ):
-      if self._stackTraceView.AnyThreadsRunning():
-        choice = utils.AskForInput( "Terminate debuggee [Y/N/default]? ", "" )
-        if choice == "Y" or choice == "y":
+
+    def disconnect():
+      self._splash_screen = utils.DisplaySplash(
+        self._api_prefix,
+        self._splash_screen,
+        "Shutting down debug adapter..." )
+
+      def handler( *args ):
+        self._splash_screen = utils.HideSplash( self._api_prefix,
+                                                self._splash_screen )
+
+        if callback:
+          self._logger.debug( "Setting server exit handler before disconnect" )
+          assert not self._run_on_server_exit
+          self._run_on_server_exit = callback
+
+        vim.eval( 'vimspector#internal#{}#StopDebugSession()'.format(
+          self._connection_type ) )
+
+      self._connection.DoRequest( handler, {
+        'command': 'disconnect',
+        'arguments': arguments,
+      }, failure_handler = handler, timeout = 5000 )
+
+    if not interactive:
+      disconnect()
+    elif not self._server_capabilities.get( 'supportTerminateDebuggee' ):
+      disconnect()
+    elif not self._stackTraceView.AnyThreadsRunning():
+      disconnect()
+    else:
+      def handle_choice( choice ):
+        if choice == 1:
+          # yes
          arguments[ 'terminateDebuggee' ] = True
-        elif choice == "N" or choice == 'n':
+        elif choice == 2:
+          # no
          arguments[ 'terminateDebuggee' ] = False
+        elif choice <= 0:
+          # Abort
+          return
+        # Else, use server default

-    self._connection.DoRequest( handler, {
-      'command': 'disconnect',
-      'arguments': arguments,
-    }, failure_handler = handler, timeout = 5000 )
+        disconnect()

-    # TODO: Use the 'tarminate' request if supportsTerminateRequest set
+      utils.Confirm( self._api_prefix,
+                     "Terminate debuggee?",
+                     handle_choice,
+                     default_value = 3,
+                     options = [ '(Y)es', '(N)o', '(D)efault' ],
+                     keys = [ 'y', 'n', 'd' ] )


  def _PrepareAttach( self, adapter_config, launch_config ):
@ -1125,6 +1270,37 @@ class DebugSession( object ):
      self._stackTraceView.LoadThreads( True )


+  @IfConnected()
+  @RequiresUI()
+  def PrintDebugInfo( self ):
+    def Line():
+      return ( "--------------------------------------------------------------"
+               "------------------" )
+
+    def Pretty( obj ):
+      if obj is None:
+        return [ "None" ]
+      return [ Line() ] + json.dumps( obj, indent=2 ).splitlines() + [ Line() ]
+
+
+    debugInfo = [
+      "Vimspector Debug Info",
+      Line(),
+      f"ConnectionType: { self._connection_type }",
+      "Adapter: " ] + Pretty( self._adapter ) + [
+      "Configuration: " ] + Pretty( self._configuration ) + [
+      f"API Prefix: { self._api_prefix }",
+      f"Launch/Init: { self._launch_complete } / { self._init_complete }",
+      f"Workspace Root: { self._workspace_root }",
+      "Launch Config: " ] + Pretty( self._launch_config ) + [
+      "Server Capabilities: " ] + Pretty( self._server_capabilities ) + [
+    ]
+
+    self._outputView.ClearCategory( 'DebugInfo' )
+    self._outputView.Print( "DebugInfo", debugInfo )
+    self.ShowOutput( "DebugInfo" )
+
+
  def OnEvent_loadedSource( self, msg ):
    pass

--- a/python3/vimspector/gadgets.py
+++ b/python3/vimspector/gadgets.py
@ -30,12 +30,12 @@ GADGETS = {
                                                                root,
                                                                gadget ),
    'all': {
-      'version': '0.27.0',
+      'version': '1.6.0',
      "adapters": {
        "vscode-cpptools": {
          "name": "cppdbg",
          "command": [
-            "${gadgetDir}/vscode-cpptools/debugAdapters/OpenDebugAD7"
+            "${gadgetDir}/vscode-cpptools/debugAdapters/bin/OpenDebugAD7"
          ],
          "attach": {
            "pidProperty": "processId",
@ -53,17 +53,17 @@ GADGETS = {
    'linux': {
      'file_name': 'cpptools-linux.vsix',
      'checksum':
-        '3695202e1e75a03de18049323b66d868165123f26151f8c974a480eaf0205435',
+        'c25299bcfb46b22d41aa3f125df7184e6282a35ff9fb69c47def744cb4778f55',
    },
    'macos': {
-      'file_name': 'cpptools-osx.vsix',
+      'file_name': 'cpptools-osx-arm64.vsix',
      'checksum':
-        'cb061e3acd7559a539e5586f8d3f535101c4ec4e8a48195856d1d39380b5cf3c',
+        'ceb3e8cdaa2b5bb45af50913ddd8402089969748af8d70f5d46480408287ba6f',
    },
    'windows': {
      'file_name': 'cpptools-win32.vsix',
      'checksum':
-        'aa294368ed16d48c59e49c8000e146eae5a19ad07b654efed5db8ec93b24229e',
+        'ef7ac5831874a3c7dbf0feb826bfda2be579aff9b6d990622fff1d0d4ede00d1',
      "adapters": {
        "vscode-cpptools": {
          "name": "cppdbg",
@ -86,29 +86,6 @@ GADGETS = {
      },
    },
  },
-  'vscode-python': {
-    'language': 'python.legacy',
-    'enabled': False,
-    'download': {
-      'url': 'https://github.com/Microsoft/vscode-python/releases/download/'
-             '${version}/${file_name}',
-    },
-    'all': {
-      'version': '2019.11.50794',
-      'file_name': 'ms-python-release.vsix',
-      'checksum':
-        '6a9edf9ecabed14aac424e6007858068204a3638bf3bb4f235bd6035d823acc6',
-    },
-    'adapters': {
-      "vscode-python": {
-        "name": "vscode-python",
-        "command": [
-          "node",
-          "${gadgetDir}/vscode-python/out/client/debugger/debugAdapter/main.js",
-        ],
-      }
-    },
-  },
  'debugpy': {
    'language': 'python',
    'download': {
@ -159,7 +136,8 @@ GADGETS = {
        "port": "${DAPPort}",
        "configuration": {
          "cwd": "${workspaceRoot}"
-        }
+        },
+        'custom_handler': 'vimspector.custom.java.JavaDebugAdapter'
      }
    },
  },
@ -233,15 +211,15 @@ GADGETS = {
      'format': 'tar',
    },
    'all': {
-      'version': '1.2.0-635'
+      'version': '1.2.0-782'
    },
    'macos': {
      'file_name': 'netcoredbg-osx.tar.gz',
      'checksum':
-        '71c773e34d358950f25119bade7e3081c4c2f9d71847bd49027ca5792e918beb',
+        '',
    },
    'linux': {
-      'file_name': 'netcoredbg-linux-bionic.tar.gz',
+      'file_name': 'netcoredbg-linux-bionic-amd64.tar.gz',
      'checksum': '',
    },
    'windows': {
@ -268,41 +246,6 @@ GADGETS = {
      },
    }
  },
-  'vscode-mono-debug': {
-    'language': 'csharp',
-    'enabled': False,
-    'download': {
-      'url': 'https://marketplace.visualstudio.com/_apis/public/gallery/'
-             'publishers/ms-vscode/vsextensions/mono-debug/${version}/'
-             'vspackage',
-      'target': 'vscode-mono-debug.vsix.gz',
-      'format': 'zip.gz',
-    },
-    'all': {
-      'file_name': 'vscode-mono-debug.vsix',
-      'version': '0.16.2',
-      'checksum':
-          '121eca297d83daeeb1e6e1d791305d1827998dbd595c330086b3b94d33dba3b9',
-    },
-    'adapters': {
-      'vscode-mono-debug': {
-        "name": "mono-debug",
-        "command": [
-          "mono",
-          "${gadgetDir}/vscode-mono-debug/bin/Release/mono-debug.exe"
-        ],
-        "attach": {
-          "pidSelect": "none"
-        },
-        "configuration": {
-          "cwd": "${workspaceRoot}",
-          "console": "integratedTerminal",
-          "args": [],
-          "env": {}
-        }
-      },
-    }
-  },
  'vscode-bash-debug': {
    'language': 'bash',
    'download': {
@ -380,10 +323,10 @@ GADGETS = {
        '${version}/${file_name}',
    },
    'all': {
-      'version': 'v1.14.9',
-      'file_name': 'php-debug.vsix',
+            'version': 'v1.17.0',
+            'file_name': 'php-debug-1.17.0.vsix',
      'checksum':
-        '0c5709cbbffe26b12aa63a88142195a9a045a5d8fca7fe63d62c789fe601630d',
+        'd0fff272503414b6696cc737bc2e18e060fdd5e5dc4bcaf38ae7373afd8d8bc9',
    },
    'adapters': {
      'vscode-php-debug': {
@ -451,12 +394,12 @@ GADGETS = {
             '${version}/${file_name}',
    },
    'all': {
-      'version': 'v1.5.3',
+      'version': 'v1.6.6',
    },
    'macos': {
-      'file_name': 'codelldb-x86_64-darwin.vsix',
+      'file_name': 'codelldb-aarch64-darwin.vsix',
      'checksum':
-        '7505bc1cdfcfd1cb981e2996aec62d63577440709bac31dcadb41a3b4b44631a',
+        '5adc3b9139eabdafd825bd5efc55df4424a203fb2b6087b425cd434956e7ec58',
      'make_executable': [
        'adapter/codelldb',
        'lldb/bin/debugserver',
@ -467,7 +410,7 @@ GADGETS = {
    'linux': {
      'file_name': 'codelldb-x86_64-linux.vsix',
      'checksum':
-        'ce7efc3e94d775368e5942a02bf5c326b6809a0b4c389f79ffa6a8f6f6b72139',
+        'eda2cd9b3089dcc0524c273e91ffb5875fe08c930bf643739a2cd1846e1f98d6',
      'make_executable': [
        'adapter/codelldb',
        'lldb/bin/lldb',
@ -478,7 +421,7 @@ GADGETS = {
    'windows': {
      'file_name': 'codelldb-x86_64-windows.vsix',
      'checksum':
-        '',
+        '8ddebe8381a3d22dc3d95139c3797fda06b5cc34aadf300e13b1c516b9da95fe',
      'make_executable': []
    },
    'adapters': {
--- a/python3/vimspector/installer.py
+++ b/python3/vimspector/installer.py
@ -358,7 +358,8 @@ 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', 'OpenDebugAD7' ) )
+  MakeExecutable(
+    os.path.join( extension, 'debugAdapters', 'bin', 'OpenDebugAD7' ) )
  with open( os.path.join( extension, 'package.json' ) ) as f:
    package = json.load( f )
    runtime_dependencies = package[ 'runtimeDependencies' ]
--- a/python3/vimspector/output.py
+++ b/python3/vimspector/output.py
@ -32,6 +32,7 @@ class TabBuffer( object ):
 BUFFER_MAP = {
  'console': 'Console',
  'stdout': 'Console',
+  'output': 'Console',
  'stderr': 'stderr',
  'telemetry': None,
 }
@ -64,8 +65,11 @@ class OutputView( object ):
    self._api_prefix = api_prefix
    VIEWS.add( self )

-  def Print( self, categroy, text ):
-    self._Print( 'server', text.splitlines() )
+  def Print( self, category, text: typing.Union[ str, list ] ):
+    if not isinstance( text, list ):
+      text = text.splitlines()
+
+    self._Print( category, text )

  def OnOutput( self, event ):
    category = CategoryToBuffer( event.get( 'category' ) or 'output' )
@ -104,13 +108,26 @@ class OutputView( object ):

  def Clear( self ):
    for category, tab_buffer in self._buffers.items():
-      if tab_buffer.is_job:
-        utils.CleanUpCommand( category, self._api_prefix )
-      utils.CleanUpHiddenBuffer( tab_buffer.buf )
+      self._CleanUpBuffer( category, tab_buffer )

    # FIXME: nunmenu the WinBar ?
    self._buffers = {}

+
+  def ClearCategory( self, category: str ):
+    if category not in self._buffers:
+      return
+
+    self._CleanUpBuffer( category, self._buffers[ category ] )
+
+
+  def _CleanUpBuffer( self, category: str, tab_buffer: TabBuffer ):
+    if tab_buffer.is_job:
+      utils.CleanUpCommand( category, self._api_prefix )
+
+    utils.CleanUpHiddenBuffer( tab_buffer.buf )
+
+
  def WindowIsValid( self ):
    return self._window.valid

--- a/python3/vimspector/settings.py
+++ b/python3/vimspector/settings.py
@ -20,11 +20,20 @@ from vimspector import utils

 DEFAULTS = {
  # UI
-  'bottombar_height':  10,
-  'sidebar_width':     50,
-  'code_minwidth':     82,
-  'terminal_maxwidth': 80,
-  'terminal_minwidth': 10,
+  'ui_mode':            'auto',
+  'bottombar_height':   10,
+
+  # For ui_mode = 'horizontal':
+  'sidebar_width':      50,
+  'code_minwidth':      82,
+  'terminal_maxwidth':  80,
+  'terminal_minwidth':  10,
+
+  # For ui_mode = 'vertical':
+  'topbar_height':      15,
+  'code_minheight':     20,
+  'terminal_maxheight': 15,
+  'terminal_minheight': 5,

  # Signs
  'sign_priority': {
@ -33,7 +42,8 @@ DEFAULTS = {
    'vimspectorBP':            9,
    'vimspectorBPCond':        9,
    'vimspectorBPDisabled':    9,
-    'vimspectorCurrentThread': 200
+    'vimspectorCurrentThread': 200,
+    'vimspectorCurrentFrame':  200,
  },

  # Installer
@ -50,7 +60,10 @@ DEFAULTS = {
      'expand_or_jump': [ '<CR>', '<2-LeftMouse>' ],
      'focus_thread': [ '<leader><CR>' ],
    }
-  }
+  },
+
+  # Custom
+  'java_hotcodereplace_mode': 'ask',
 }


--- a/python3/vimspector/stack_trace.py
+++ b/python3/vimspector/stack_trace.py
@ -102,7 +102,8 @@ class StackTraceView( object ):
    self._scratch_buffers = []

    # FIXME: This ID is by group, so should be module scope
-    self._next_sign_id = 1
+    self._current_thread_sign_id = 0 # 1 when used
+    self._current_frame_sign_id = 0 # 2 when used

    utils.SetUpHiddenBuffer( self._buf, 'vimspector.StackTrace' )
    utils.SetUpUIWindow( win )
@ -127,6 +128,7 @@ class StackTraceView( object ):
                     ':call vimspector#SetCurrentThread()<CR>' )

    win.options[ 'cursorline' ] = False
+    win.options[ 'signcolumn' ] = 'auto'


    if not signs.SignDefined( 'vimspectorCurrentThread' ):
@ -136,6 +138,13 @@ class StackTraceView( object ):
                        texthl = 'MatchParen',
                        linehl = 'CursorLine' )

+    if not signs.SignDefined( 'vimspectorCurrentFrame' ):
+      signs.DefineSign( 'vimspectorCurrentFrame',
+                        text = '▶ ',
+                        double_text = '▶',
+                        texthl = 'Special',
+                        linehl = 'CursorLine' )
+
    self._line_to_frame = {}
    self._line_to_thread = {}

@ -157,9 +166,12 @@ class StackTraceView( object ):
    self._sources = {}
    self._requesting_threads = StackTraceView.ThreadRequestState.NO
    self._pending_thread_request = None
-    if self._next_sign_id:
-      signs.UnplaceSign( self._next_sign_id, 'VimspectorStackTrace' )
-    self._next_sign_id = 0
+    if self._current_thread_sign_id:
+      signs.UnplaceSign( self._current_thread_sign_id, 'VimspectorStackTrace' )
+    self._current_thread_sign_id = 0
+    if self._current_frame_sign_id:
+      signs.UnplaceSign( self._current_frame_sign_id, 'VimspectorStackTrace' )
+    self._current_frame_sign_id = 0

    with utils.ModifiableScratchBuffer( self._buf ):
      utils.ClearBuffer( self._buf )
@ -273,10 +285,10 @@ class StackTraceView( object ):
    self._line_to_frame.clear()
    self._line_to_thread.clear()

-    if self._next_sign_id:
-      signs.UnplaceSign( self._next_sign_id, 'VimspectorStackTrace' )
+    if self._current_thread_sign_id:
+      signs.UnplaceSign( self._current_thread_sign_id, 'VimspectorStackTrace' )
    else:
-      self._next_sign_id = 1
+      self._current_thread_sign_id = 1

    with utils.ModifiableScratchBuffer( self._buf ):
      with utils.RestoreCursorPosition():
@ -290,7 +302,7 @@ class StackTraceView( object ):
            f'({thread.State()})' )

          if self._current_thread == thread.id:
-            signs.PlaceSign( self._next_sign_id,
+            signs.PlaceSign( self._current_thread_sign_id,
                             'VimspectorStackTrace',
                             'vimspectorCurrentThread',
                             self._buf.name,
@ -367,6 +379,46 @@ class StackTraceView( object ):
      self._JumpToFrame( frame )


+
+  def _GetFrameOffset( self, delta ):
+    thread: Thread
+    for thread in self._threads:
+      if thread.id != self._current_thread:
+        continue
+
+      if not thread.stacktrace:
+        return
+
+      frame_idx = None
+      for index, frame in enumerate( thread.stacktrace ):
+        if frame == self._current_frame:
+          frame_idx = index
+          break
+
+      if frame_idx is not None:
+        target_idx = frame_idx + delta
+        if target_idx >= 0 and target_idx < len( thread.stacktrace ):
+          return thread.stacktrace[ target_idx ]
+
+      break
+
+
+  def UpFrame( self ):
+    frame = self._GetFrameOffset( 1 )
+    if not frame:
+      utils.UserMessage( 'Top of stack' )
+    else:
+      self._JumpToFrame( frame, 'up' )
+
+
+  def DownFrame( self ):
+    frame = self._GetFrameOffset( -1 )
+    if not frame:
+      utils.UserMessage( 'Bottom of stack' )
+    else:
+      self._JumpToFrame( frame, 'down' )
+
+
  def AnyThreadsRunning( self ):
    for thread in self._threads:
      if thread.state != Thread.TERMINATED:
@ -381,6 +433,7 @@ class StackTraceView( object ):
        # Should this set the current _Thread_ too ? If i jump to a frame in
        # Thread 2, should that become the focussed thread ?
        self._current_frame = frame
+        self._DrawThreads()
        return self._session.SetCurrentFrame( self._current_frame, reason )
      return False

@ -478,6 +531,11 @@ class StackTraceView( object ):
    if not thread.IsExpanded():
      return

+    if self._current_frame_sign_id:
+      signs.UnplaceSign( self._current_frame_sign_id, 'VimspectorStackTrace' )
+    else:
+      self._current_frame_sign_id = 2
+
    for frame in thread.stacktrace:
      if frame.get( 'source' ):
        source = frame[ 'source' ]
@ -502,6 +560,14 @@ class StackTraceView( object ):
                                       source[ 'name' ],
                                       frame[ 'line' ] ) )

+      if ( self._current_frame is not None and
+           self._current_frame[ 'id' ] == frame[ 'id' ] ):
+        signs.PlaceSign( self._current_frame_sign_id,
+                         'VimspectorStackTrace',
+                         'vimspectorCurrentFrame',
+                         self._buf.name,
+                         line )
+
      self._line_to_frame[ line ] = ( thread, frame )

  def _ResolveSource( self, source, and_then ):
--- a/python3/vimspector/terminal.py
+++ b/python3/vimspector/terminal.py
@ -23,12 +23,53 @@ def LaunchTerminal( api_prefix,
  env = params.get( 'env' ) or {}

  term_options = {
-    'vertical': 1,
    'norestore': 1,
    'cwd': cwd,
    'env': env,
  }

+  if settings.Get( 'ui_mode' ) == 'horizontal':
+    # force-horizontal
+    term_options[ 'vertical' ] = 1
+  elif utils.GetVimValue( vim.vars[ 'vimspector_session_windows' ],
+                          'mode' ) == 'horizontal':
+    # horizontal, which means that we should have enough space for:
+    #  - sidebar
+    #  - code min
+    #  - term min width
+    #  - + 2 vertical spaders
+    #  - + 3 columns for signs
+    term_options[ 'vertical' ] = 1
+
+    # if we don't have enough space for terminal_maxwidth, then see if we have
+    # enough vertically for terminal_maxheight, in which case,
+    # that seems a better fit
+    term_horiz_max = ( settings.Int( 'sidebar_width' ) +
+                       1 + 2 + 3 +
+                       settings.Int( 'code_minwidth' ) +
+                       1 + settings.Int( 'terminal_maxwidth' ) )
+    term_vert_max = ( settings.Int( 'bottombar_height' ) + 1 +
+                      settings.Int( 'code_minheight' ) + 1 +
+                      settings.Int( 'terminal_minheight' ) )
+
+    if ( vim.options[ 'columns' ] < term_horiz_max and
+         vim.options[ 'lines' ] >= term_vert_max ):
+      # Looks like it, let's try that layout
+      term_options[ 'vertical' ] = 0
+
+
+  else:
+    # vertical - we need enough space horizontally for the code+terminal, but we
+    # may fit better with code above terminal
+    term_options[ 'vertical' ] = 0
+
+    term_horiz_max = ( settings.Int( 'code_minwidth' ) + 3 +
+                       settings.Int( 'terminal_maxwidth' ) + 1 )
+
+    if vim.options[ 'columns' ] > term_horiz_max:
+      term_options[ 'vertical' ] = 1
+
+
  if not window_for_start or not window_for_start.valid:
    # TOOD: Where? Maybe we should just use botright vertical ...
    window_for_start = vim.current.window
@ -50,13 +91,23 @@ def LaunchTerminal( api_prefix,
    # If we're making a vertical split from the code window, make it no more
    # than 80 columns and no fewer than 10. Also try and keep the code window
    # at least 82 columns
-    if term_options[ 'vertical' ] and not term_options.get( 'curwin', 0 ):
+    if term_options.get( 'curwin', 0 ):
+      pass
+    elif term_options[ 'vertical' ]:
      term_options[ 'term_cols' ] = max(
        min ( int( vim.eval( 'winwidth( 0 )' ) )
                   - settings.Int( 'code_minwidth' ),
              settings.Int( 'terminal_maxwidth' ) ),
        settings.Int( 'terminal_minwidth' )
      )
+    else:
+      term_options[ 'term_rows' ] = max(
+        min ( int( vim.eval( 'winheight( 0 )' ) )
+                   - settings.Int( 'code_minheight' ),
+              settings.Int( 'terminal_maxheight' ) ),
+        settings.Int( 'terminal_minheight' )
+      )
+

    buffer_number = int(
      utils.Call(
--- a/python3/vimspector/utils.py
+++ b/python3/vimspector/utils.py
@ -375,6 +375,44 @@ def AskForInput( prompt, default_value = None, completion = None ):
      return None


+CONFIRM = {}
+CONFIRM_ID = 0
+
+
+def ConfirmCallback( confirm_id, result ):
+  try:
+    handler = CONFIRM.pop( confirm_id )
+  except KeyError:
+    UserMessage( f"Internal error: unexpected callback id { confirm_id }",
+                 persist = True,
+                 error = True )
+    return
+
+  handler( result )
+
+
+def Confirm( api_prefix,
+             prompt,
+             handler,
+             default_value = 2,
+             options: list = None,
+             keys: list = None ):
+  if not options:
+    options = [ '(Y)es', '(N)o' ]
+  if not keys:
+    keys = [ 'y', 'n' ]
+
+  global CONFIRM_ID
+  CONFIRM_ID += 1
+  CONFIRM[ CONFIRM_ID ] = handler
+  Call( f'vimspector#internal#{ api_prefix }popup#Confirm',
+        CONFIRM_ID,
+        prompt,
+        options,
+        default_value,
+        keys )
+
+
 def AppendToBuffer( buf, line_or_lines, modified=False ):
  line = 1
  try:
@ -403,8 +441,10 @@ def AppendToBuffer( buf, line_or_lines, modified=False ):



-def ClearBuffer( buf ):
+def ClearBuffer( buf, modified = False ):
  buf[ : ] = None
+  if not modified:
+    buf.options[ 'modified' ] = False


 def SetBufferContents( buf, lines, modified=False ):
@ -494,7 +534,6 @@ def _Substitute( template, mapping ):
    if mo.group( 'braceddefault' ) is not None:
      named = mo.group( 'defname' )
      if named not in mapping:
-        ''
        raise MissingSubstitution(
          named,
          mo.group( 'default' ).replace( '\\}', '}' ) )
@ -536,8 +575,11 @@ def ExpandReferencesInString( orig_s,
        if default_value is None and e.default_value is not None:
          try:
            default_value = _Substitute( e.default_value, mapping )
-          except MissingSubstitution:
-            default_value = e.default_value
+          except MissingSubstitution as e2:
+            if e2.name in calculus:
+              default_value = calculus[ e2.name ]()
+            else:
+              default_value = e.default_value

        mapping[ key ] = AskForInput( 'Enter value for {}: '.format( key ),
                                      default_value )
--- a/12
+++ b/12
@ -21,7 +21,7 @@ out_fd=1

 while [ -n "$1" ]; do
  case "$1" in
-    "--basedir")
+    "--basedir"|"--base-dir"|"--test-base")
      shift
      SetBaseDir $1
      shift
@ -36,7 +36,7 @@ while [ -n "$1" ]; do
      INSTALL=$1
      shift
      ;;
-    "--update")
+    "--update"|"--upgrade")
      UPDATE=1
      shift
      ;;
@ -91,7 +91,8 @@ if [ "$INSTALL" = "1" ] || [ "$INSTALL" = "script" ]; then
  if ! python3 $(dirname $0)/install_gadget.py \
               --basedir ${BASEDIR} \
               ${INSTALLER_ARGS} \
-               --all; then
+               --all \
+               --force-enable-csharp; then
    echo "Script installation reported errors" >&2
    exit 1
  fi
@ -102,7 +103,7 @@ if [ "$INSTALL" = "1" ] || [ "$INSTALL" = "vim" ]; then
               --cmd "${BASEDIR_CMD}" \
               -c 'autocmd User VimspectorInstallSuccess qa!' \
               -c 'autocmd User VimspectorInstallFailed cquit!' \
-               -c "VimspectorInstall --all"; then
+               -c "VimspectorInstall --all netcoredbg"; then
    echo "Vim installation reported errors" >&2
    exit 1
  fi
@ -144,6 +145,9 @@ set -e
  pushd tests/testdata/cpp/simple
    make clean all
  popd
+  pushd support/test/csharp
+    dotnet build
+  popd
 set +e
 echo "%DONE - built test programs"

--- 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 cols . 'wincmd |'
+  execute string(cols) . 'wincmd |'
 endfunction

 function! s:CustomiseWinBar()
--- a/support/gadget_upgrade/README.md
+++ b/support/gadget_upgrade/README.md
@ -0,0 +1,8 @@
+# Manually updating shipped gadgets
+
+Download the gadget files manuall from their official source into this dir.
+Run `./checksum.py <list of files>` to get the checksums.
+
+Update ../../python3/vimspector/gadgets.py with the new version and the
+checksums.
+
--- a/support/gadget_upgrade/checksum.py
+++ b/support/gadget_upgrade/checksum.py
@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+import hashlib
+import sys
+
+
+def GetChecksumSHA254( file_path ):
+  with open( file_path, 'rb' ) as existing_file:
+    return hashlib.sha256( existing_file.read() ).hexdigest()
+
+
+for arg in sys.argv[ 1: ]:
+  print( f"{ arg } = { GetChecksumSHA254( arg ) }" )
--- a/support/test/bash/.vimspector.json
+++ b/support/test/bash/.vimspector.json
@ -0,0 +1,15 @@
+{
+  "$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/support/test/cpp/simple_c_program/.vimspector.json
+++ b/support/test/cpp/simple_c_program/.vimspector.json
@ -15,6 +15,15 @@
        "program": "${workspaceRoot}/test",
        "stopAtEntry": true
      }
+    },
+    "cpptools": {
+      "adapter": "vscode-cpptools",
+      "configuration": {
+        "request": "launch",
+        "program": "${workspaceRoot}/test",
+        "stopOnEntry": true,
+        "MIMode": "lldb"
+      }
    }
  }
 }
--- a/support/test/cpp/simple_c_program/.ycm_extra_conf.py
+++ b/support/test/cpp/simple_c_program/.ycm_extra_conf.py
@ -1,4 +1,4 @@
 def Settings( **kwargs ):
  return {
-    'flags': [ '-x', 'c++', '-Wall', '-Wextra' ]
+    'flags': [ '-x', 'c++', '-Wall', '-Wextra', '-std=c++17' ]
  }
--- a/support/test/csharp/.gitignore
+++ b/support/test/csharp/.gitignore
@ -1,2 +1,3 @@
 bin/
 obj/Debug
+obj/
--- a/support/test/csharp/.vimspector.json
+++ b/support/test/csharp/.vimspector.json
@ -1,25 +1,57 @@
 {
-    "configurations": {
-      "launch - netcoredbg": {
-        "adapter": "netcoredbg",
-        "configuration": {
-          "request": "launch",
-          "program": "${workspaceRoot}/bin/Debug/netcoreapp2.2/csharp.dll",
-          "args": [],
-          "stopAtEntry": true
-        }
+  "adapters": {
+    "netcoredbg-debuglog": {
+      "attach": {
+        "pidProperty": "processId",
+        "pidSelect": "ask"
      },
-      "launch - mono": {
-        "adapter": "vscode-mono-debug",
-        "configuration": {
-          "request": "launch",
-          "program": "${workspaceRoot}/Program.exe",
-          "console": "integratedTerminal",
-          "cwd": "${workspaceRoot}",
-          "args": [],
-          "env": {}
-        }
+      "command": [
+        "${gadgetDir}/netcoredbg/netcoredbg",
+        "--interpreter=vscode",
+        "--engineLogging=${workspaceRoot}/netcoredbg.engine.log",
+        "--log=${workspaceRoot}/netcoredbg.log"
+      ],
+      "configuration": {
+        "cwd": "${workspaceRoot}"
+      },
+      "name": "netcoredbg"
+    }
+  },
+  "configurations": {
+    //
+    // NOTE:
+    // If you add to this, you must update tests/get_configurations.test.vim
+    //
+
+    "launch - netcoredbg": {
+      "adapter": "netcoredbg",
+      "configuration": {
+        "request": "launch",
+        "program": "${workspaceRoot}/bin/Debug/netcoreapp3.1/csharp.dll",
+        "args": [],
+        "stopAtEntry": false
+      }
+    },
+    "launch - netcoredbg - with debug log": {
+      "adapter": "netcoredbg-debuglog",
+      "configuration": {
+        "request": "launch",
+        "program": "${workspaceRoot}/bin/Debug/netcoreapp3.1/csharp.dll",
+        "args": [],
+        "stopAtEntry": false
+      }
+    },
+    "launch - mono": {
+      "adapter": "vscode-mono-debug",
+      "configuration": {
+        "request": "launch",
+        "program": "${workspaceRoot}/Program.exe",
+        "console": "integratedTerminal",
+        "cwd": "${workspaceRoot}",
+        "args": [],
+        "env": {}
      }
    }
+  }
 }

--- a/support/test/csharp/csharp.csproj
+++ b/support/test/csharp/csharp.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/support/test/csharp/csharp.sln
+++ b/support/test/csharp/csharp.sln
@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp", "csharp.csproj", "{91DB205F-E422-430B-BBB8-955110C7B3B6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -15,4 +17,18 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Debug|x86.Build.0 = Debug|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Release|x64.Build.0 = Release|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{91DB205F-E422-430B-BBB8-955110C7B3B6}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
 EndGlobal
--- a/support/test/csharp/obj/csharp.csproj.nuget.cache
+++ b/support/test/csharp/obj/csharp.csproj.nuget.cache
@ -1,5 +0,0 @@
-{
-  "version": 1,
-  "dgSpecHash": "6/vdr7YprlSIoQecv/nNuLNflFpO0X7eN7jHUinZTsgian9nYpmHMWirsDWMi5l+29TH+Qy8O/QfaB/48QtjRQ==",
-  "success": true
-}
--- a/support/test/csharp/obj/csharp.csproj.nuget.g.props
+++ b/support/test/csharp/obj/csharp.csproj.nuget.g.props
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/ben/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/ben/.nuget/packages/;/usr/local/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.7.0</NuGetToolVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
-  </ItemGroup>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.2.0/build/netcoreapp2.2/Microsoft.NETCore.App.props" Condition="Exists('/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.2.0/build/netcoreapp2.2/Microsoft.NETCore.App.props')" />
-  </ImportGroup>
-</Project>
--- a/support/test/csharp/obj/csharp.csproj.nuget.g.targets
+++ b/support/test/csharp/obj/csharp.csproj.nuget.g.targets
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="/usr/local/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/build/netstandard2.0/NETStandard.Library.targets" Condition="Exists('/usr/local/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/build/netstandard2.0/NETStandard.Library.targets')" />
-    <Import Project="/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.2.0/build/netcoreapp2.2/Microsoft.NETCore.App.targets" Condition="Exists('/usr/local/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.app/2.2.0/build/netcoreapp2.2/Microsoft.NETCore.App.targets')" />
-  </ImportGroup>
-</Project>
--- a/support/test/csharp/obj/project.assets.json
+++ b/support/test/csharp/obj/project.assets.json
@ -1,748 +0,0 @@
-{
-  "version": 3,
-  "targets": {
-    ".NETCoreApp,Version=v2.2": {
-      "Microsoft.NETCore.App/2.2.0": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.NETCore.DotNetHostPolicy": "2.2.0",
-          "Microsoft.NETCore.Platforms": "2.2.0",
-          "Microsoft.NETCore.Targets": "2.0.0",
-          "NETStandard.Library": "2.0.3"
-        },
-        "compile": {
-          "ref/netcoreapp2.2/Microsoft.CSharp.dll": {},
-          "ref/netcoreapp2.2/Microsoft.VisualBasic.dll": {},
-          "ref/netcoreapp2.2/Microsoft.Win32.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.AppContext.dll": {},
-          "ref/netcoreapp2.2/System.Buffers.dll": {},
-          "ref/netcoreapp2.2/System.Collections.Concurrent.dll": {},
-          "ref/netcoreapp2.2/System.Collections.Immutable.dll": {},
-          "ref/netcoreapp2.2/System.Collections.NonGeneric.dll": {},
-          "ref/netcoreapp2.2/System.Collections.Specialized.dll": {},
-          "ref/netcoreapp2.2/System.Collections.dll": {},
-          "ref/netcoreapp2.2/System.ComponentModel.Annotations.dll": {},
-          "ref/netcoreapp2.2/System.ComponentModel.DataAnnotations.dll": {},
-          "ref/netcoreapp2.2/System.ComponentModel.EventBasedAsync.dll": {},
-          "ref/netcoreapp2.2/System.ComponentModel.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.ComponentModel.TypeConverter.dll": {},
-          "ref/netcoreapp2.2/System.ComponentModel.dll": {},
-          "ref/netcoreapp2.2/System.Configuration.dll": {},
-          "ref/netcoreapp2.2/System.Console.dll": {},
-          "ref/netcoreapp2.2/System.Core.dll": {},
-          "ref/netcoreapp2.2/System.Data.Common.dll": {},
-          "ref/netcoreapp2.2/System.Data.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.Contracts.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.Debug.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.DiagnosticSource.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.FileVersionInfo.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.Process.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.StackTrace.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.TextWriterTraceListener.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.Tools.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.TraceSource.dll": {},
-          "ref/netcoreapp2.2/System.Diagnostics.Tracing.dll": {},
-          "ref/netcoreapp2.2/System.Drawing.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.Drawing.dll": {},
-          "ref/netcoreapp2.2/System.Dynamic.Runtime.dll": {},
-          "ref/netcoreapp2.2/System.Globalization.Calendars.dll": {},
-          "ref/netcoreapp2.2/System.Globalization.Extensions.dll": {},
-          "ref/netcoreapp2.2/System.Globalization.dll": {},
-          "ref/netcoreapp2.2/System.IO.Compression.Brotli.dll": {},
-          "ref/netcoreapp2.2/System.IO.Compression.FileSystem.dll": {},
-          "ref/netcoreapp2.2/System.IO.Compression.ZipFile.dll": {},
-          "ref/netcoreapp2.2/System.IO.Compression.dll": {},
-          "ref/netcoreapp2.2/System.IO.FileSystem.DriveInfo.dll": {},
-          "ref/netcoreapp2.2/System.IO.FileSystem.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.IO.FileSystem.Watcher.dll": {},
-          "ref/netcoreapp2.2/System.IO.FileSystem.dll": {},
-          "ref/netcoreapp2.2/System.IO.IsolatedStorage.dll": {},
-          "ref/netcoreapp2.2/System.IO.MemoryMappedFiles.dll": {},
-          "ref/netcoreapp2.2/System.IO.Pipes.dll": {},
-          "ref/netcoreapp2.2/System.IO.UnmanagedMemoryStream.dll": {},
-          "ref/netcoreapp2.2/System.IO.dll": {},
-          "ref/netcoreapp2.2/System.Linq.Expressions.dll": {},
-          "ref/netcoreapp2.2/System.Linq.Parallel.dll": {},
-          "ref/netcoreapp2.2/System.Linq.Queryable.dll": {},
-          "ref/netcoreapp2.2/System.Linq.dll": {},
-          "ref/netcoreapp2.2/System.Memory.dll": {},
-          "ref/netcoreapp2.2/System.Net.Http.dll": {},
-          "ref/netcoreapp2.2/System.Net.HttpListener.dll": {},
-          "ref/netcoreapp2.2/System.Net.Mail.dll": {},
-          "ref/netcoreapp2.2/System.Net.NameResolution.dll": {},
-          "ref/netcoreapp2.2/System.Net.NetworkInformation.dll": {},
-          "ref/netcoreapp2.2/System.Net.Ping.dll": {},
-          "ref/netcoreapp2.2/System.Net.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.Net.Requests.dll": {},
-          "ref/netcoreapp2.2/System.Net.Security.dll": {},
-          "ref/netcoreapp2.2/System.Net.ServicePoint.dll": {},
-          "ref/netcoreapp2.2/System.Net.Sockets.dll": {},
-          "ref/netcoreapp2.2/System.Net.WebClient.dll": {},
-          "ref/netcoreapp2.2/System.Net.WebHeaderCollection.dll": {},
-          "ref/netcoreapp2.2/System.Net.WebProxy.dll": {},
-          "ref/netcoreapp2.2/System.Net.WebSockets.Client.dll": {},
-          "ref/netcoreapp2.2/System.Net.WebSockets.dll": {},
-          "ref/netcoreapp2.2/System.Net.dll": {},
-          "ref/netcoreapp2.2/System.Numerics.Vectors.dll": {},
-          "ref/netcoreapp2.2/System.Numerics.dll": {},
-          "ref/netcoreapp2.2/System.ObjectModel.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.DispatchProxy.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.Emit.ILGeneration.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.Emit.Lightweight.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.Emit.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.Extensions.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.Metadata.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.TypeExtensions.dll": {},
-          "ref/netcoreapp2.2/System.Reflection.dll": {},
-          "ref/netcoreapp2.2/System.Resources.Reader.dll": {},
-          "ref/netcoreapp2.2/System.Resources.ResourceManager.dll": {},
-          "ref/netcoreapp2.2/System.Resources.Writer.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.CompilerServices.VisualC.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Extensions.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Handles.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.InteropServices.RuntimeInformation.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.InteropServices.WindowsRuntime.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.InteropServices.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Loader.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Numerics.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Serialization.Formatters.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Serialization.Json.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Serialization.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Serialization.Xml.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.Serialization.dll": {},
-          "ref/netcoreapp2.2/System.Runtime.dll": {},
-          "ref/netcoreapp2.2/System.Security.Claims.dll": {},
-          "ref/netcoreapp2.2/System.Security.Cryptography.Algorithms.dll": {},
-          "ref/netcoreapp2.2/System.Security.Cryptography.Csp.dll": {},
-          "ref/netcoreapp2.2/System.Security.Cryptography.Encoding.dll": {},
-          "ref/netcoreapp2.2/System.Security.Cryptography.Primitives.dll": {},
-          "ref/netcoreapp2.2/System.Security.Cryptography.X509Certificates.dll": {},
-          "ref/netcoreapp2.2/System.Security.Principal.dll": {},
-          "ref/netcoreapp2.2/System.Security.SecureString.dll": {},
-          "ref/netcoreapp2.2/System.Security.dll": {},
-          "ref/netcoreapp2.2/System.ServiceModel.Web.dll": {},
-          "ref/netcoreapp2.2/System.ServiceProcess.dll": {},
-          "ref/netcoreapp2.2/System.Text.Encoding.Extensions.dll": {},
-          "ref/netcoreapp2.2/System.Text.Encoding.dll": {},
-          "ref/netcoreapp2.2/System.Text.RegularExpressions.dll": {},
-          "ref/netcoreapp2.2/System.Threading.Overlapped.dll": {},
-          "ref/netcoreapp2.2/System.Threading.Tasks.Dataflow.dll": {},
-          "ref/netcoreapp2.2/System.Threading.Tasks.Extensions.dll": {},
-          "ref/netcoreapp2.2/System.Threading.Tasks.Parallel.dll": {},
-          "ref/netcoreapp2.2/System.Threading.Tasks.dll": {},
-          "ref/netcoreapp2.2/System.Threading.Thread.dll": {},
-          "ref/netcoreapp2.2/System.Threading.ThreadPool.dll": {},
-          "ref/netcoreapp2.2/System.Threading.Timer.dll": {},
-          "ref/netcoreapp2.2/System.Threading.dll": {},
-          "ref/netcoreapp2.2/System.Transactions.Local.dll": {},
-          "ref/netcoreapp2.2/System.Transactions.dll": {},
-          "ref/netcoreapp2.2/System.ValueTuple.dll": {},
-          "ref/netcoreapp2.2/System.Web.HttpUtility.dll": {},
-          "ref/netcoreapp2.2/System.Web.dll": {},
-          "ref/netcoreapp2.2/System.Windows.dll": {},
-          "ref/netcoreapp2.2/System.Xml.Linq.dll": {},
-          "ref/netcoreapp2.2/System.Xml.ReaderWriter.dll": {},
-          "ref/netcoreapp2.2/System.Xml.Serialization.dll": {},
-          "ref/netcoreapp2.2/System.Xml.XDocument.dll": {},
-          "ref/netcoreapp2.2/System.Xml.XPath.XDocument.dll": {},
-          "ref/netcoreapp2.2/System.Xml.XPath.dll": {},
-          "ref/netcoreapp2.2/System.Xml.XmlDocument.dll": {},
-          "ref/netcoreapp2.2/System.Xml.XmlSerializer.dll": {},
-          "ref/netcoreapp2.2/System.Xml.dll": {},
-          "ref/netcoreapp2.2/System.dll": {},
-          "ref/netcoreapp2.2/WindowsBase.dll": {},
-          "ref/netcoreapp2.2/mscorlib.dll": {},
-          "ref/netcoreapp2.2/netstandard.dll": {}
-        },
-        "build": {
-          "build/netcoreapp2.2/Microsoft.NETCore.App.props": {},
-          "build/netcoreapp2.2/Microsoft.NETCore.App.targets": {}
-        }
-      },
-      "Microsoft.NETCore.DotNetAppHost/2.2.0": {
-        "type": "package"
-      },
-      "Microsoft.NETCore.DotNetHostPolicy/2.2.0": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.NETCore.DotNetHostResolver": "2.2.0"
-        }
-      },
-      "Microsoft.NETCore.DotNetHostResolver/2.2.0": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.NETCore.DotNetAppHost": "2.2.0"
-        }
-      },
-      "Microsoft.NETCore.Platforms/2.2.0": {
-        "type": "package",
-        "compile": {
-          "lib/netstandard1.0/_._": {}
-        },
-        "runtime": {
-          "lib/netstandard1.0/_._": {}
-        }
-      },
-      "Microsoft.NETCore.Targets/2.0.0": {
-        "type": "package",
-        "compile": {
-          "lib/netstandard1.0/_._": {}
-        },
-        "runtime": {
-          "lib/netstandard1.0/_._": {}
-        }
-      },
-      "NETStandard.Library/2.0.3": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
-        },
-        "compile": {
-          "lib/netstandard1.0/_._": {}
-        },
-        "runtime": {
-          "lib/netstandard1.0/_._": {}
-        },
-        "build": {
-          "build/netstandard2.0/NETStandard.Library.targets": {}
-        }
-      }
-    }
-  },
-  "libraries": {
-    "Microsoft.NETCore.App/2.2.0": {
-      "sha512": "7z5l8Jp324S8bU8+yyWeYHXUFYvKyiI5lqS1dXgTzOx1H69Qbf6df12kCKlNX45LpMfCMd4U3M6p7Rl5Zk7SLA==",
-      "type": "package",
-      "path": "microsoft.netcore.app/2.2.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "LICENSE.TXT",
-        "Microsoft.NETCore.App.versions.txt",
-        "THIRD-PARTY-NOTICES.TXT",
-        "build/netcoreapp2.2/Microsoft.NETCore.App.PlatformManifest.txt",
-        "build/netcoreapp2.2/Microsoft.NETCore.App.props",
-        "build/netcoreapp2.2/Microsoft.NETCore.App.targets",
-        "microsoft.netcore.app.2.2.0.nupkg.sha512",
-        "microsoft.netcore.app.nuspec",
-        "ref/netcoreapp2.2/Microsoft.CSharp.dll",
-        "ref/netcoreapp2.2/Microsoft.CSharp.xml",
-        "ref/netcoreapp2.2/Microsoft.VisualBasic.dll",
-        "ref/netcoreapp2.2/Microsoft.VisualBasic.xml",
-        "ref/netcoreapp2.2/Microsoft.Win32.Primitives.dll",
-        "ref/netcoreapp2.2/Microsoft.Win32.Primitives.xml",
-        "ref/netcoreapp2.2/System.AppContext.dll",
-        "ref/netcoreapp2.2/System.Buffers.dll",
-        "ref/netcoreapp2.2/System.Buffers.xml",
-        "ref/netcoreapp2.2/System.Collections.Concurrent.dll",
-        "ref/netcoreapp2.2/System.Collections.Concurrent.xml",
-        "ref/netcoreapp2.2/System.Collections.Immutable.dll",
-        "ref/netcoreapp2.2/System.Collections.Immutable.xml",
-        "ref/netcoreapp2.2/System.Collections.NonGeneric.dll",
-        "ref/netcoreapp2.2/System.Collections.NonGeneric.xml",
-        "ref/netcoreapp2.2/System.Collections.Specialized.dll",
-        "ref/netcoreapp2.2/System.Collections.Specialized.xml",
-        "ref/netcoreapp2.2/System.Collections.dll",
-        "ref/netcoreapp2.2/System.Collections.xml",
-        "ref/netcoreapp2.2/System.ComponentModel.Annotations.dll",
-        "ref/netcoreapp2.2/System.ComponentModel.Annotations.xml",
-        "ref/netcoreapp2.2/System.ComponentModel.DataAnnotations.dll",
-        "ref/netcoreapp2.2/System.ComponentModel.EventBasedAsync.dll",
-        "ref/netcoreapp2.2/System.ComponentModel.EventBasedAsync.xml",
-        "ref/netcoreapp2.2/System.ComponentModel.Primitives.dll",
-        "ref/netcoreapp2.2/System.ComponentModel.Primitives.xml",
-        "ref/netcoreapp2.2/System.ComponentModel.TypeConverter.dll",
-        "ref/netcoreapp2.2/System.ComponentModel.TypeConverter.xml",
-        "ref/netcoreapp2.2/System.ComponentModel.dll",
-        "ref/netcoreapp2.2/System.ComponentModel.xml",
-        "ref/netcoreapp2.2/System.Configuration.dll",
-        "ref/netcoreapp2.2/System.Console.dll",
-        "ref/netcoreapp2.2/System.Console.xml",
-        "ref/netcoreapp2.2/System.Core.dll",
-        "ref/netcoreapp2.2/System.Data.Common.dll",
-        "ref/netcoreapp2.2/System.Data.Common.xml",
-        "ref/netcoreapp2.2/System.Data.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.Contracts.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.Contracts.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.Debug.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.Debug.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.DiagnosticSource.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.DiagnosticSource.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.FileVersionInfo.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.FileVersionInfo.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.Process.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.Process.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.StackTrace.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.StackTrace.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.TextWriterTraceListener.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.TextWriterTraceListener.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.Tools.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.Tools.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.TraceSource.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.TraceSource.xml",
-        "ref/netcoreapp2.2/System.Diagnostics.Tracing.dll",
-        "ref/netcoreapp2.2/System.Diagnostics.Tracing.xml",
-        "ref/netcoreapp2.2/System.Drawing.Primitives.dll",
-        "ref/netcoreapp2.2/System.Drawing.Primitives.xml",
-        "ref/netcoreapp2.2/System.Drawing.dll",
-        "ref/netcoreapp2.2/System.Dynamic.Runtime.dll",
-        "ref/netcoreapp2.2/System.Globalization.Calendars.dll",
-        "ref/netcoreapp2.2/System.Globalization.Extensions.dll",
-        "ref/netcoreapp2.2/System.Globalization.dll",
-        "ref/netcoreapp2.2/System.IO.Compression.Brotli.dll",
-        "ref/netcoreapp2.2/System.IO.Compression.FileSystem.dll",
-        "ref/netcoreapp2.2/System.IO.Compression.ZipFile.dll",
-        "ref/netcoreapp2.2/System.IO.Compression.ZipFile.xml",
-        "ref/netcoreapp2.2/System.IO.Compression.dll",
-        "ref/netcoreapp2.2/System.IO.Compression.xml",
-        "ref/netcoreapp2.2/System.IO.FileSystem.DriveInfo.dll",
-        "ref/netcoreapp2.2/System.IO.FileSystem.DriveInfo.xml",
-        "ref/netcoreapp2.2/System.IO.FileSystem.Primitives.dll",
-        "ref/netcoreapp2.2/System.IO.FileSystem.Watcher.dll",
-        "ref/netcoreapp2.2/System.IO.FileSystem.Watcher.xml",
-        "ref/netcoreapp2.2/System.IO.FileSystem.dll",
-        "ref/netcoreapp2.2/System.IO.FileSystem.xml",
-        "ref/netcoreapp2.2/System.IO.IsolatedStorage.dll",
-        "ref/netcoreapp2.2/System.IO.IsolatedStorage.xml",
-        "ref/netcoreapp2.2/System.IO.MemoryMappedFiles.dll",
-        "ref/netcoreapp2.2/System.IO.MemoryMappedFiles.xml",
-        "ref/netcoreapp2.2/System.IO.Pipes.dll",
-        "ref/netcoreapp2.2/System.IO.Pipes.xml",
-        "ref/netcoreapp2.2/System.IO.UnmanagedMemoryStream.dll",
-        "ref/netcoreapp2.2/System.IO.dll",
-        "ref/netcoreapp2.2/System.Linq.Expressions.dll",
-        "ref/netcoreapp2.2/System.Linq.Expressions.xml",
-        "ref/netcoreapp2.2/System.Linq.Parallel.dll",
-        "ref/netcoreapp2.2/System.Linq.Parallel.xml",
-        "ref/netcoreapp2.2/System.Linq.Queryable.dll",
-        "ref/netcoreapp2.2/System.Linq.Queryable.xml",
-        "ref/netcoreapp2.2/System.Linq.dll",
-        "ref/netcoreapp2.2/System.Linq.xml",
-        "ref/netcoreapp2.2/System.Memory.dll",
-        "ref/netcoreapp2.2/System.Memory.xml",
-        "ref/netcoreapp2.2/System.Net.Http.dll",
-        "ref/netcoreapp2.2/System.Net.Http.xml",
-        "ref/netcoreapp2.2/System.Net.HttpListener.dll",
-        "ref/netcoreapp2.2/System.Net.HttpListener.xml",
-        "ref/netcoreapp2.2/System.Net.Mail.dll",
-        "ref/netcoreapp2.2/System.Net.Mail.xml",
-        "ref/netcoreapp2.2/System.Net.NameResolution.dll",
-        "ref/netcoreapp2.2/System.Net.NameResolution.xml",
-        "ref/netcoreapp2.2/System.Net.NetworkInformation.dll",
-        "ref/netcoreapp2.2/System.Net.NetworkInformation.xml",
-        "ref/netcoreapp2.2/System.Net.Ping.dll",
-        "ref/netcoreapp2.2/System.Net.Ping.xml",
-        "ref/netcoreapp2.2/System.Net.Primitives.dll",
-        "ref/netcoreapp2.2/System.Net.Primitives.xml",
-        "ref/netcoreapp2.2/System.Net.Requests.dll",
-        "ref/netcoreapp2.2/System.Net.Requests.xml",
-        "ref/netcoreapp2.2/System.Net.Security.dll",
-        "ref/netcoreapp2.2/System.Net.Security.xml",
-        "ref/netcoreapp2.2/System.Net.ServicePoint.dll",
-        "ref/netcoreapp2.2/System.Net.ServicePoint.xml",
-        "ref/netcoreapp2.2/System.Net.Sockets.dll",
-        "ref/netcoreapp2.2/System.Net.Sockets.xml",
-        "ref/netcoreapp2.2/System.Net.WebClient.dll",
-        "ref/netcoreapp2.2/System.Net.WebClient.xml",
-        "ref/netcoreapp2.2/System.Net.WebHeaderCollection.dll",
-        "ref/netcoreapp2.2/System.Net.WebHeaderCollection.xml",
-        "ref/netcoreapp2.2/System.Net.WebProxy.dll",
-        "ref/netcoreapp2.2/System.Net.WebProxy.xml",
-        "ref/netcoreapp2.2/System.Net.WebSockets.Client.dll",
-        "ref/netcoreapp2.2/System.Net.WebSockets.Client.xml",
-        "ref/netcoreapp2.2/System.Net.WebSockets.dll",
-        "ref/netcoreapp2.2/System.Net.WebSockets.xml",
-        "ref/netcoreapp2.2/System.Net.dll",
-        "ref/netcoreapp2.2/System.Numerics.Vectors.dll",
-        "ref/netcoreapp2.2/System.Numerics.Vectors.xml",
-        "ref/netcoreapp2.2/System.Numerics.dll",
-        "ref/netcoreapp2.2/System.ObjectModel.dll",
-        "ref/netcoreapp2.2/System.ObjectModel.xml",
-        "ref/netcoreapp2.2/System.Reflection.DispatchProxy.dll",
-        "ref/netcoreapp2.2/System.Reflection.DispatchProxy.xml",
-        "ref/netcoreapp2.2/System.Reflection.Emit.ILGeneration.dll",
-        "ref/netcoreapp2.2/System.Reflection.Emit.ILGeneration.xml",
-        "ref/netcoreapp2.2/System.Reflection.Emit.Lightweight.dll",
-        "ref/netcoreapp2.2/System.Reflection.Emit.Lightweight.xml",
-        "ref/netcoreapp2.2/System.Reflection.Emit.dll",
-        "ref/netcoreapp2.2/System.Reflection.Emit.xml",
-        "ref/netcoreapp2.2/System.Reflection.Extensions.dll",
-        "ref/netcoreapp2.2/System.Reflection.Metadata.dll",
-        "ref/netcoreapp2.2/System.Reflection.Metadata.xml",
-        "ref/netcoreapp2.2/System.Reflection.Primitives.dll",
-        "ref/netcoreapp2.2/System.Reflection.Primitives.xml",
-        "ref/netcoreapp2.2/System.Reflection.TypeExtensions.dll",
-        "ref/netcoreapp2.2/System.Reflection.TypeExtensions.xml",
-        "ref/netcoreapp2.2/System.Reflection.dll",
-        "ref/netcoreapp2.2/System.Resources.Reader.dll",
-        "ref/netcoreapp2.2/System.Resources.ResourceManager.dll",
-        "ref/netcoreapp2.2/System.Resources.ResourceManager.xml",
-        "ref/netcoreapp2.2/System.Resources.Writer.dll",
-        "ref/netcoreapp2.2/System.Resources.Writer.xml",
-        "ref/netcoreapp2.2/System.Runtime.CompilerServices.VisualC.dll",
-        "ref/netcoreapp2.2/System.Runtime.CompilerServices.VisualC.xml",
-        "ref/netcoreapp2.2/System.Runtime.Extensions.dll",
-        "ref/netcoreapp2.2/System.Runtime.Extensions.xml",
-        "ref/netcoreapp2.2/System.Runtime.Handles.dll",
-        "ref/netcoreapp2.2/System.Runtime.InteropServices.RuntimeInformation.dll",
-        "ref/netcoreapp2.2/System.Runtime.InteropServices.RuntimeInformation.xml",
-        "ref/netcoreapp2.2/System.Runtime.InteropServices.WindowsRuntime.dll",
-        "ref/netcoreapp2.2/System.Runtime.InteropServices.WindowsRuntime.xml",
-        "ref/netcoreapp2.2/System.Runtime.InteropServices.dll",
-        "ref/netcoreapp2.2/System.Runtime.InteropServices.xml",
-        "ref/netcoreapp2.2/System.Runtime.Loader.dll",
-        "ref/netcoreapp2.2/System.Runtime.Loader.xml",
-        "ref/netcoreapp2.2/System.Runtime.Numerics.dll",
-        "ref/netcoreapp2.2/System.Runtime.Numerics.xml",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Formatters.dll",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Formatters.xml",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Json.dll",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Json.xml",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Primitives.dll",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Primitives.xml",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Xml.dll",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.Xml.xml",
-        "ref/netcoreapp2.2/System.Runtime.Serialization.dll",
-        "ref/netcoreapp2.2/System.Runtime.dll",
-        "ref/netcoreapp2.2/System.Runtime.xml",
-        "ref/netcoreapp2.2/System.Security.Claims.dll",
-        "ref/netcoreapp2.2/System.Security.Claims.xml",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Algorithms.dll",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Algorithms.xml",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Csp.dll",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Csp.xml",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Encoding.dll",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Encoding.xml",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Primitives.dll",
-        "ref/netcoreapp2.2/System.Security.Cryptography.Primitives.xml",
-        "ref/netcoreapp2.2/System.Security.Cryptography.X509Certificates.dll",
-        "ref/netcoreapp2.2/System.Security.Cryptography.X509Certificates.xml",
-        "ref/netcoreapp2.2/System.Security.Principal.dll",
-        "ref/netcoreapp2.2/System.Security.Principal.xml",
-        "ref/netcoreapp2.2/System.Security.SecureString.dll",
-        "ref/netcoreapp2.2/System.Security.dll",
-        "ref/netcoreapp2.2/System.ServiceModel.Web.dll",
-        "ref/netcoreapp2.2/System.ServiceProcess.dll",
-        "ref/netcoreapp2.2/System.Text.Encoding.Extensions.dll",
-        "ref/netcoreapp2.2/System.Text.Encoding.Extensions.xml",
-        "ref/netcoreapp2.2/System.Text.Encoding.dll",
-        "ref/netcoreapp2.2/System.Text.RegularExpressions.dll",
-        "ref/netcoreapp2.2/System.Text.RegularExpressions.xml",
-        "ref/netcoreapp2.2/System.Threading.Overlapped.dll",
-        "ref/netcoreapp2.2/System.Threading.Overlapped.xml",
-        "ref/netcoreapp2.2/System.Threading.Tasks.Dataflow.dll",
-        "ref/netcoreapp2.2/System.Threading.Tasks.Dataflow.xml",
-        "ref/netcoreapp2.2/System.Threading.Tasks.Extensions.dll",
-        "ref/netcoreapp2.2/System.Threading.Tasks.Extensions.xml",
-        "ref/netcoreapp2.2/System.Threading.Tasks.Parallel.dll",
-        "ref/netcoreapp2.2/System.Threading.Tasks.Parallel.xml",
-        "ref/netcoreapp2.2/System.Threading.Tasks.dll",
-        "ref/netcoreapp2.2/System.Threading.Tasks.xml",
-        "ref/netcoreapp2.2/System.Threading.Thread.dll",
-        "ref/netcoreapp2.2/System.Threading.Thread.xml",
-        "ref/netcoreapp2.2/System.Threading.ThreadPool.dll",
-        "ref/netcoreapp2.2/System.Threading.ThreadPool.xml",
-        "ref/netcoreapp2.2/System.Threading.Timer.dll",
-        "ref/netcoreapp2.2/System.Threading.Timer.xml",
-        "ref/netcoreapp2.2/System.Threading.dll",
-        "ref/netcoreapp2.2/System.Threading.xml",
-        "ref/netcoreapp2.2/System.Transactions.Local.dll",
-        "ref/netcoreapp2.2/System.Transactions.Local.xml",
-        "ref/netcoreapp2.2/System.Transactions.dll",
-        "ref/netcoreapp2.2/System.ValueTuple.dll",
-        "ref/netcoreapp2.2/System.Web.HttpUtility.dll",
-        "ref/netcoreapp2.2/System.Web.HttpUtility.xml",
-        "ref/netcoreapp2.2/System.Web.dll",
-        "ref/netcoreapp2.2/System.Windows.dll",
-        "ref/netcoreapp2.2/System.Xml.Linq.dll",
-        "ref/netcoreapp2.2/System.Xml.ReaderWriter.dll",
-        "ref/netcoreapp2.2/System.Xml.ReaderWriter.xml",
-        "ref/netcoreapp2.2/System.Xml.Serialization.dll",
-        "ref/netcoreapp2.2/System.Xml.XDocument.dll",
-        "ref/netcoreapp2.2/System.Xml.XDocument.xml",
-        "ref/netcoreapp2.2/System.Xml.XPath.XDocument.dll",
-        "ref/netcoreapp2.2/System.Xml.XPath.XDocument.xml",
-        "ref/netcoreapp2.2/System.Xml.XPath.dll",
-        "ref/netcoreapp2.2/System.Xml.XPath.xml",
-        "ref/netcoreapp2.2/System.Xml.XmlDocument.dll",
-        "ref/netcoreapp2.2/System.Xml.XmlSerializer.dll",
-        "ref/netcoreapp2.2/System.Xml.XmlSerializer.xml",
-        "ref/netcoreapp2.2/System.Xml.dll",
-        "ref/netcoreapp2.2/System.dll",
-        "ref/netcoreapp2.2/WindowsBase.dll",
-        "ref/netcoreapp2.2/mscorlib.dll",
-        "ref/netcoreapp2.2/netstandard.dll",
-        "runtime.json"
-      ]
-    },
-    "Microsoft.NETCore.DotNetAppHost/2.2.0": {
-      "sha512": "DrhaKInRKKvN6Ns2VNIlC7ZffLOp9THf8cO6X4fytPRJovJUbF49/zzx4WfgX9E44FMsw9hT8hrKiIqDSHvGvA==",
-      "type": "package",
-      "path": "microsoft.netcore.dotnetapphost/2.2.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "LICENSE.TXT",
-        "THIRD-PARTY-NOTICES.TXT",
-        "microsoft.netcore.dotnetapphost.2.2.0.nupkg.sha512",
-        "microsoft.netcore.dotnetapphost.nuspec",
-        "runtime.json"
-      ]
-    },
-    "Microsoft.NETCore.DotNetHostPolicy/2.2.0": {
-      "sha512": "FJie7IoPZFaPgNDxhZGmDBQP/Bs5vPdfca/G2Wf9gd6LIvMYkZcibtmJwB4tcf4KXkaOYfIOo4Cl9sEPMsSzkw==",
-      "type": "package",
-      "path": "microsoft.netcore.dotnethostpolicy/2.2.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "LICENSE.TXT",
-        "THIRD-PARTY-NOTICES.TXT",
-        "microsoft.netcore.dotnethostpolicy.2.2.0.nupkg.sha512",
-        "microsoft.netcore.dotnethostpolicy.nuspec",
-        "runtime.json"
-      ]
-    },
-    "Microsoft.NETCore.DotNetHostResolver/2.2.0": {
-      "sha512": "spDm3AJYmebthDNhzY17YLPtvbc+Y1lCLVeiIH1uLJ/hZaM+40pBiPefFR8J1u66Ndkqi8ipR2tEbqPnYnjRhw==",
-      "type": "package",
-      "path": "microsoft.netcore.dotnethostresolver/2.2.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "LICENSE.TXT",
-        "THIRD-PARTY-NOTICES.TXT",
-        "microsoft.netcore.dotnethostresolver.2.2.0.nupkg.sha512",
-        "microsoft.netcore.dotnethostresolver.nuspec",
-        "runtime.json"
-      ]
-    },
-    "Microsoft.NETCore.Platforms/2.2.0": {
-      "sha512": "T/J+XZo+YheFTJh8/4uoeJDdz5qOmOMkjg6/VL8mHJ9AnP8+fmV/kcbxeXsob0irRNiChf+V0ig1MCRLp/+Kog==",
-      "type": "package",
-      "path": "microsoft.netcore.platforms/2.2.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "LICENSE.TXT",
-        "THIRD-PARTY-NOTICES.TXT",
-        "lib/netstandard1.0/_._",
-        "microsoft.netcore.platforms.2.2.0.nupkg.sha512",
-        "microsoft.netcore.platforms.nuspec",
-        "runtime.json",
-        "useSharedDesignerContext.txt",
-        "version.txt"
-      ]
-    },
-    "Microsoft.NETCore.Targets/2.0.0": {
-      "sha512": "odP/tJj1z6GylFpNo7pMtbd/xQgTC3Ex2If63dRTL38bBNMwsBnJ+RceUIyHdRBC0oik/3NehYT+oECwBhIM3Q==",
-      "type": "package",
-      "path": "microsoft.netcore.targets/2.0.0",
-      "files": [
-        ".nupkg.metadata",
-        "LICENSE.TXT",
-        "THIRD-PARTY-NOTICES.TXT",
-        "lib/netstandard1.0/_._",
-        "microsoft.netcore.targets.2.0.0.nupkg.sha512",
-        "microsoft.netcore.targets.nuspec",
-        "runtime.json",
-        "useSharedDesignerContext.txt",
-        "version.txt"
-      ]
-    },
-    "NETStandard.Library/2.0.3": {
-      "sha512": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
-      "type": "package",
-      "path": "netstandard.library/2.0.3",
-      "files": [
-        ".nupkg.metadata",
-        "LICENSE.TXT",
-        "THIRD-PARTY-NOTICES.TXT",
-        "build/netstandard2.0/NETStandard.Library.targets",
-        "build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll",
-        "build/netstandard2.0/ref/System.AppContext.dll",
-        "build/netstandard2.0/ref/System.Collections.Concurrent.dll",
-        "build/netstandard2.0/ref/System.Collections.NonGeneric.dll",
-        "build/netstandard2.0/ref/System.Collections.Specialized.dll",
-        "build/netstandard2.0/ref/System.Collections.dll",
-        "build/netstandard2.0/ref/System.ComponentModel.Composition.dll",
-        "build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll",
-        "build/netstandard2.0/ref/System.ComponentModel.Primitives.dll",
-        "build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll",
-        "build/netstandard2.0/ref/System.ComponentModel.dll",
-        "build/netstandard2.0/ref/System.Console.dll",
-        "build/netstandard2.0/ref/System.Core.dll",
-        "build/netstandard2.0/ref/System.Data.Common.dll",
-        "build/netstandard2.0/ref/System.Data.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.Contracts.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.Debug.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.Process.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.Tools.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll",
-        "build/netstandard2.0/ref/System.Diagnostics.Tracing.dll",
-        "build/netstandard2.0/ref/System.Drawing.Primitives.dll",
-        "build/netstandard2.0/ref/System.Drawing.dll",
-        "build/netstandard2.0/ref/System.Dynamic.Runtime.dll",
-        "build/netstandard2.0/ref/System.Globalization.Calendars.dll",
-        "build/netstandard2.0/ref/System.Globalization.Extensions.dll",
-        "build/netstandard2.0/ref/System.Globalization.dll",
-        "build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll",
-        "build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll",
-        "build/netstandard2.0/ref/System.IO.Compression.dll",
-        "build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll",
-        "build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll",
-        "build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll",
-        "build/netstandard2.0/ref/System.IO.FileSystem.dll",
-        "build/netstandard2.0/ref/System.IO.IsolatedStorage.dll",
-        "build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll",
-        "build/netstandard2.0/ref/System.IO.Pipes.dll",
-        "build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll",
-        "build/netstandard2.0/ref/System.IO.dll",
-        "build/netstandard2.0/ref/System.Linq.Expressions.dll",
-        "build/netstandard2.0/ref/System.Linq.Parallel.dll",
-        "build/netstandard2.0/ref/System.Linq.Queryable.dll",
-        "build/netstandard2.0/ref/System.Linq.dll",
-        "build/netstandard2.0/ref/System.Net.Http.dll",
-        "build/netstandard2.0/ref/System.Net.NameResolution.dll",
-        "build/netstandard2.0/ref/System.Net.NetworkInformation.dll",
-        "build/netstandard2.0/ref/System.Net.Ping.dll",
-        "build/netstandard2.0/ref/System.Net.Primitives.dll",
-        "build/netstandard2.0/ref/System.Net.Requests.dll",
-        "build/netstandard2.0/ref/System.Net.Security.dll",
-        "build/netstandard2.0/ref/System.Net.Sockets.dll",
-        "build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll",
-        "build/netstandard2.0/ref/System.Net.WebSockets.Client.dll",
-        "build/netstandard2.0/ref/System.Net.WebSockets.dll",
-        "build/netstandard2.0/ref/System.Net.dll",
-        "build/netstandard2.0/ref/System.Numerics.dll",
-        "build/netstandard2.0/ref/System.ObjectModel.dll",
-        "build/netstandard2.0/ref/System.Reflection.Extensions.dll",
-        "build/netstandard2.0/ref/System.Reflection.Primitives.dll",
-        "build/netstandard2.0/ref/System.Reflection.dll",
-        "build/netstandard2.0/ref/System.Resources.Reader.dll",
-        "build/netstandard2.0/ref/System.Resources.ResourceManager.dll",
-        "build/netstandard2.0/ref/System.Resources.Writer.dll",
-        "build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll",
-        "build/netstandard2.0/ref/System.Runtime.Extensions.dll",
-        "build/netstandard2.0/ref/System.Runtime.Handles.dll",
-        "build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll",
-        "build/netstandard2.0/ref/System.Runtime.InteropServices.dll",
-        "build/netstandard2.0/ref/System.Runtime.Numerics.dll",
-        "build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll",
-        "build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll",
-        "build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll",
-        "build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll",
-        "build/netstandard2.0/ref/System.Runtime.Serialization.dll",
-        "build/netstandard2.0/ref/System.Runtime.dll",
-        "build/netstandard2.0/ref/System.Security.Claims.dll",
-        "build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll",
-        "build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll",
-        "build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll",
-        "build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll",
-        "build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll",
-        "build/netstandard2.0/ref/System.Security.Principal.dll",
-        "build/netstandard2.0/ref/System.Security.SecureString.dll",
-        "build/netstandard2.0/ref/System.ServiceModel.Web.dll",
-        "build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll",
-        "build/netstandard2.0/ref/System.Text.Encoding.dll",
-        "build/netstandard2.0/ref/System.Text.RegularExpressions.dll",
-        "build/netstandard2.0/ref/System.Threading.Overlapped.dll",
-        "build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll",
-        "build/netstandard2.0/ref/System.Threading.Tasks.dll",
-        "build/netstandard2.0/ref/System.Threading.Thread.dll",
-        "build/netstandard2.0/ref/System.Threading.ThreadPool.dll",
-        "build/netstandard2.0/ref/System.Threading.Timer.dll",
-        "build/netstandard2.0/ref/System.Threading.dll",
-        "build/netstandard2.0/ref/System.Transactions.dll",
-        "build/netstandard2.0/ref/System.ValueTuple.dll",
-        "build/netstandard2.0/ref/System.Web.dll",
-        "build/netstandard2.0/ref/System.Windows.dll",
-        "build/netstandard2.0/ref/System.Xml.Linq.dll",
-        "build/netstandard2.0/ref/System.Xml.ReaderWriter.dll",
-        "build/netstandard2.0/ref/System.Xml.Serialization.dll",
-        "build/netstandard2.0/ref/System.Xml.XDocument.dll",
-        "build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll",
-        "build/netstandard2.0/ref/System.Xml.XPath.dll",
-        "build/netstandard2.0/ref/System.Xml.XmlDocument.dll",
-        "build/netstandard2.0/ref/System.Xml.XmlSerializer.dll",
-        "build/netstandard2.0/ref/System.Xml.dll",
-        "build/netstandard2.0/ref/System.dll",
-        "build/netstandard2.0/ref/mscorlib.dll",
-        "build/netstandard2.0/ref/netstandard.dll",
-        "build/netstandard2.0/ref/netstandard.xml",
-        "lib/netstandard1.0/_._",
-        "netstandard.library.2.0.3.nupkg.sha512",
-        "netstandard.library.nuspec"
-      ]
-    }
-  },
-  "projectFileDependencyGroups": {
-    ".NETCoreApp,Version=v2.2": [
-      "Microsoft.NETCore.App >= 2.2.0"
-    ]
-  },
-  "packageFolders": {
-    "/Users/ben/.nuget/packages/": {},
-    "/usr/local/share/dotnet/sdk/NuGetFallbackFolder": {}
-  },
-  "project": {
-    "version": "1.0.0",
-    "restore": {
-      "projectUniqueName": "/Users/ben/.vim/bundle/vimspector/support/test/csharp/csharp.csproj",
-      "projectName": "csharp",
-      "projectPath": "/Users/ben/.vim/bundle/vimspector/support/test/csharp/csharp.csproj",
-      "packagesPath": "/Users/ben/.nuget/packages/",
-      "outputPath": "/Users/ben/.vim/bundle/vimspector/support/test/csharp/obj/",
-      "projectStyle": "PackageReference",
-      "fallbackFolders": [
-        "/usr/local/share/dotnet/sdk/NuGetFallbackFolder"
-      ],
-      "configFilePaths": [
-        "/Users/ben/.nuget/NuGet/NuGet.Config"
-      ],
-      "originalTargetFrameworks": [
-        "netcoreapp2.2"
-      ],
-      "sources": {
-        "https://api.nuget.org/v3/index.json": {}
-      },
-      "frameworks": {
-        "netcoreapp2.2": {
-          "projectReferences": {}
-        }
-      },
-      "warningProperties": {
-        "warnAsError": [
-          "NU1605"
-        ]
-      }
-    },
-    "frameworks": {
-      "netcoreapp2.2": {
-        "dependencies": {
-          "Microsoft.NETCore.App": {
-            "suppressParent": "All",
-            "target": "Package",
-            "version": "[2.2.0, )",
-            "autoReferenced": true
-          }
-        },
-        "imports": [
-          "net461",
-          "net462",
-          "net47",
-          "net471",
-          "net472",
-          "net48"
-        ],
-        "assetTargetFallback": true,
-        "warn": true,
-        "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/3.1.402/RuntimeIdentifierGraph.json"
-      }
-    }
-  }
-}
--- a/support/test/go/hello_world/.vimspector.json
+++ b/support/test/go/hello_world/.vimspector.json
@ -1,4 +1,18 @@
 {
+  "adapters": {
+    "dlv-dap": {
+      "variables": {
+        "port": "${unusedLocalPort}"
+      },
+      "command": [
+        "$HOME/go/bin/dlv",
+        "dap",
+        "--listen",
+        "127.0.0.1:${port}"
+      ],
+      "port": "${port}"
+    }
+  },
  "configurations": {
    "run": {
      "adapter": "vscode-go",
@ -12,6 +26,21 @@
        "env": { "GO111MODULE": "off" }
      }
    },
+    "run-dap": {
+      "adapter": "dlv-dap",
+      "configuration": {
+        "request": "launch",
+        "env": { "GO111MODULE": "off" },
+
+        "mode": "debug", // debug|test
+        "program": "${workspaceRoot}/hello-world.go"
+
+        // "args": [],
+        // "buildFlags": ...
+        // "stackTraceDepth": ...,
+        // "showGlobalVariables": true,
+      }
+    },
    "run-exec": {
      // NOTE: To use this you _must_ disable optimistaion:
      // go build -o hello_world -gcflags="all=-N -l"
--- a/support/test/go/name-starts-with-vowel/.vimspector.json
+++ b/support/test/go/name-starts-with-vowel/.vimspector.json
@ -0,0 +1,29 @@
+{
+    "configurations": {
+        "run-cmd": {
+            "adapter": "vscode-go",
+            "configuration": {
+                "request": "launch",
+                "program": "${workspaceRoot}/cmd/namestartswithvowel/main.go",
+                "mode": "debug",
+                "dlvToolPath": "$HOME/go/bin/dlv",
+                "dlvLoadConfig": {
+                    "maxArrayValues": 1000,
+                    "maxStringLen": 1000
+                }
+            }
+        },
+        "test-current-file": {
+            "adapter": "vscode-go",
+            "configuration": {
+                "request": "launch",
+                "mode": "test",
+                "program": "${fileDirname}",
+                "cwd": "${fileDirname}",
+                "dlvToolPath": "$GOPATH/bin/dlv",
+                "env": {},
+                "args": []
+            }
+        }
+    }
+}
--- a/support/test/go/name-starts-with-vowel/README.md
+++ b/support/test/go/name-starts-with-vowel/README.md
@ -0,0 +1,33 @@
+# Purpose
+
+This example comes with two example vimspector configs for the Go programming language.
+
+1) `run-cmd` will launch the main programme under `cmd/namestartswithvowel`.
+1) `test-current-file` will run the tests in the current file in debug mode.
+
+## Example use-cases
+
+### run-cmd
+
+* Open `cmd/namestartswithvowel/main.go`
+* Add a breakpoint somewhere within the programme
+* Start the debugger (`:call vimspector#Continue()` or your relevant keymapping)
+* Select the first launch configuration (`1: run-cmd`)
+
+### test-current-file
+
+* Open `internal/vowels/vowels_test.go`
+* Add a breakpoint somewhere within the test
+* Start the debugger (`:call vimspector#Continue()` or your relevant keymapping)
+* Select the second launch configuration (`2: test-current-file`)
+
+## Additional Configuration
+
+There are two additional configuration options specified under `run-cmd`; these parameters configure the maximum string/array size to be shown while debugging.
+
+```
+"dlvLoadConfig": {
+    "maxArrayValues": 1000,
+    "maxStringLen": 1000
+}
+```
--- a/support/test/go/name-starts-with-vowel/cmd/namestartswithvowel/main.go
+++ b/support/test/go/name-starts-with-vowel/cmd/namestartswithvowel/main.go
@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+
+	"example.com/internal/vowels"
+)
+
+func main() {
+	names := []string{"Simon", "Bob", "Jennifer", "Amy", "Duke", "Elizabeth"}
+
+	for _, n := range names {
+		if vowels.NameStartsWithVowel(n) {
+			fmt.Printf("%s starts with a vowel!\n", n)
+			continue
+		}
+
+		fmt.Printf("%s does not start with a vowel!\n", n)
+	}
+}
--- a/support/test/go/name-starts-with-vowel/go.mod
+++ b/support/test/go/name-starts-with-vowel/go.mod
@ -0,0 +1,3 @@
+module example.com
+
+go 1.16
--- a/support/test/go/name-starts-with-vowel/internal/vowels/vowels.go
+++ b/support/test/go/name-starts-with-vowel/internal/vowels/vowels.go
@ -0,0 +1,9 @@
+package vowels
+
+import "strings"
+
+func NameStartsWithVowel(name string) bool {
+	s := strings.Split(strings.ToLower(name), "")
+
+	return s[0] == "a" || s[0] == "e" || s[0] == "i" || s[0] == "o" || s[0] == "u"
+}
--- a/support/test/go/name-starts-with-vowel/internal/vowels/vowels_test.go
+++ b/support/test/go/name-starts-with-vowel/internal/vowels/vowels_test.go
@ -0,0 +1,30 @@
+package vowels
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestNameStartsWithVowel(t *testing.T) {
+	testCases := []struct {
+		input          string
+		expectedOutput bool
+	}{
+		{
+			input:          "Simon",
+			expectedOutput: false,
+		},
+		{
+			input:          "Andy",
+			expectedOutput: true,
+		},
+	}
+	for _, tt := range testCases {
+		t.Run(fmt.Sprintf("%s should product %t", tt.input, tt.expectedOutput), func(t *testing.T) {
+			out := NameStartsWithVowel(tt.input)
+			if out != tt.expectedOutput {
+				t.Errorf("%s produced %t, when %t was expected", tt.input, out, tt.expectedOutput)
+			}
+		})
+	}
+}
--- a/support/test/java/test_project/pom.xml
+++ b/support/test/java/test_project/pom.xml
@ -4,7 +4,7 @@
  <artifactId>TestApplication</artifactId>
  <version>1</version>
  <properties>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
  </properties>
 </project>
--- a/tests/ci/image/Dockerfile
+++ b/tests/ci/image/Dockerfile
@ -70,6 +70,12 @@ RUN mkdir -p /home/linuxbrew/.linuxbrew &&\

 RUN /home/linuxbrew/.linuxbrew/bin/brew install golang

+# dotnet
+RUN curl -sSL https://dot.net/v1/dotnet-install.sh \
+        | bash /dev/stdin --channel LTS --install-dir /usr/share/dotnet && \
+        update-alternatives --install /usr/bin/dotnet dotnet \
+                                                      /usr/share/dotnet/dotnet 1
+
 # clean up
 RUN /home/linuxbrew/.linuxbrew/bin/brew cleanup && \
    rm -rf ~/.cache && \
--- a/tests/get_configurations.test.vim
+++ b/tests/get_configurations.test.vim
@ -12,6 +12,7 @@ function Test_Get_Configurations()
  let configs = vimspector#GetConfigurations()
  call assert_equal([
              \ 'launch - netcoredbg',
+              \ 'launch - netcoredbg - with debug log',
              \ 'launch - mono',
              \ ], configs)

--- a/tests/language_csharp.test.vim
+++ b/tests/language_csharp.test.vim
@ -0,0 +1,65 @@
+function! SetUp()
+  call vimspector#test#setup#SetUpWithMappings( v:none )
+endfunction
+
+function! ClearDown()
+  call vimspector#test#setup#ClearDown()
+endfunction
+
+function! SetUp_Test_Go_Simple()
+  let g:vimspector_enable_mappings = 'HUMAN'
+endfunction
+
+function! Test_CSharp_Simple()
+  let fn='Program.cs'
+  lcd ../support/test/csharp
+  exe 'edit ' . fn
+
+  call vimspector#SetLineBreakpoint( fn, 31 )
+  call vimspector#LaunchWithSettings( {
+        \ 'configuration': 'launch - netcoredbg'
+        \ } )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 31, 7 )
+  call WaitForAssert( {->
+        \ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 31 )
+        \ } )
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 32, 12 )
+  call WaitForAssert( {->
+        \ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 32 )
+        \ } )
+
+  call vimspector#test#setup#Reset()
+
+  lcd -
+  %bwipeout!
+endfunction
+
+
+function! Test_Run_To_Cursor()
+  let fn='Program.cs'
+  lcd ../support/test/csharp
+  exe 'edit ' . fn
+
+  call vimspector#SetLineBreakpoint( fn, 31 )
+  call vimspector#LaunchWithSettings( {
+        \ 'configuration': 'launch - netcoredbg'
+        \ } )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 31, 7 )
+  call WaitForAssert( {->
+        \ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 31 )
+        \ } )
+
+  call cursor( 33, 1 )
+  call vimspector#RunToCursor()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 33, 1 )
+  call WaitForAssert( {->
+        \ vimspector#test#signs#AssertPCIsAtLineInBuffer( fn, 33 )
+        \ } )
+
+  call vimspector#test#setup#Reset()
+  lcd -
+  %bwipeout!
+endfunction
+
--- a/tests/lib/autoload/vimspector/test/setup.vim
+++ b/tests/lib/autoload/vimspector/test/setup.vim
@ -50,3 +50,59 @@ function! vimspector#test#setup#Reset() abort
  call popup_clear()
 endfunction

+let s:g_stack = {}
+
+function! vimspector#test#setup#PushGlobal( name, value ) abort
+  if !has_key( s:g_stack, a:name )
+    let s:g_stack[ a:name ] = []
+  endif
+
+  let old_value = get( g:, a:name, v:null )
+  call add( s:g_stack[ a:name ], old_value )
+  let g:[ a:name ] = a:value
+
+  return old_value
+endfunction
+
+function! vimspector#test#setup#PopGlobal( name ) abort
+  if !has_key( s:g_stack, a:name ) || len( s:g_stack[ a:name ] ) == 0
+    return v:null
+  endif
+
+  let old_value = s:g_stack[ a:name ][ -1 ]
+  call remove( s:g_stack[ a:name ], -1 )
+
+  if old_value is v:null
+    silent! call remove( g:, a:name )
+  else
+    let g:[ a:name ] = old_value
+  endif
+
+  return old_value
+endfunction
+
+let s:o_stack = {}
+
+function! vimspector#test#setup#PushOption( name, value ) abort
+  if !has_key( s:o_stack, a:name )
+    let s:o_stack[ a:name ] = []
+  endif
+
+  let old_value = v:null
+  execute 'let old_value = &' . a:name
+  call add( s:o_stack[ a:name ], old_value )
+  execute 'set ' . a:name . '=' . a:value
+  return old_value
+endfunction
+
+function! vimspector#test#setup#PopOption( name ) abort
+  if !has_key( s:o_stack, a:name ) || len( s:o_stack[ a:name ] ) == 0
+    return v:null
+  endif
+
+  let old_value = s:o_stack[ a:name ][ -1 ]
+  call remove( s:o_stack[ a:name ], -1 )
+
+  execute 'set ' . a:name . '=' . old_value
+  return old_value
+endfunction
--- a/tests/lib/plugin/shared.vim
+++ b/tests/lib/plugin/shared.vim
@ -99,7 +99,7 @@ function! ThisTestIsFlaky()
  let g:test_is_flaky = v:true
 endfunction

-function! AssertMatchist( expected, actual ) abort
+function! AssertMatchList( expected, actual ) abort
  let ret = assert_equal( len( a:expected ), len( a:actual ) )
  let len = min( [ len( a:expected ), len( a:actual ) ] )
  let idx = 0
--- a/tests/python/Test_ExpandReferencesInDict.py
+++ b/tests/python/Test_ExpandReferencesInDict.py
@ -35,6 +35,7 @@ class TestExpandReferencesInDict( unittest.TestCase ):
      'one': '${one}',
      'two': '${one} and ${two}',
      'three': '${three}',
+      'three_with_default': '${three_with_default:${three\\}}', # uses calculus
      'four': '${four}',
      'five': '${five}',
      'list': [ '*${words}' ],
@ -58,6 +59,7 @@ class TestExpandReferencesInDict( unittest.TestCase ):
      'one': 'one',
      'two': 'one and TWO',
      'three': '3',
+      'three_with_default': '3',
      'four': 'typed text',
      'five': '5ive!',
      'list': [ 'these', 'are', 'some', 'words' ],
--- a/tests/stack_trace.test.vim
+++ b/tests/stack_trace.test.vim
@ -30,7 +30,7 @@ function! Test_Multiple_Threads_Continue()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call cursor( 1, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '- Thread [0-9]\+: .* (paused)',
        \         '  .*: .*@threads.cpp:' . string( thread_l )
@ -45,7 +45,7 @@ function! Test_Multiple_Threads_Continue()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call cursor( 1, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '- Thread [0-9]\+: .* (paused)',
        \         '  .*: .*@threads.cpp:' . string( thread_l )
@ -56,7 +56,7 @@ function! Test_Multiple_Threads_Continue()
        \   )
        \ } )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \     ],
@ -70,7 +70,7 @@ function! Test_Multiple_Threads_Continue()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call cursor( 1, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '- Thread [0-9]\+: .* (paused)',
        \         '  .*: .*@threads.cpp:' . string( thread_l )
@ -81,7 +81,7 @@ function! Test_Multiple_Threads_Continue()
        \   )
        \ } )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \     ],
@ -95,7 +95,7 @@ function! Test_Multiple_Threads_Continue()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call cursor( 1, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '- Thread [0-9]\+: .* (paused)',
        \         '  .*: .*@threads.cpp:' . string( thread_l )
@ -106,7 +106,7 @@ function! Test_Multiple_Threads_Continue()
        \   )
        \ } )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \     ],
@ -121,7 +121,7 @@ function! Test_Multiple_Threads_Continue()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call cursor( 1, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '- Thread [0-9]\+: .* (paused)',
        \         '  .*: .*@threads.cpp:' . string( thread_l )
@ -132,7 +132,7 @@ function! Test_Multiple_Threads_Continue()
        \   )
        \ } )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \     ],
@ -146,7 +146,7 @@ function! Test_Multiple_Threads_Continue()
  " So we break out of the loop
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, notify_l, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '- Thread [0-9]\+: .* (paused)',
        \         '  .*: .*@threads.cpp:' . string( notify_l )
@ -157,7 +157,7 @@ function! Test_Multiple_Threads_Continue()
        \   )
        \ } )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \     ],
@ -192,7 +192,7 @@ function! Test_Multiple_Threads_Step()

  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '- Thread [0-9]\+: .* (paused)',
        \         '  .*: .*@threads.cpp:' . string( thread_l )
@ -205,7 +205,7 @@ function! Test_Multiple_Threads_Step()
  call vimspector#StepOver()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \     ],
@ -218,7 +218,7 @@ function! Test_Multiple_Threads_Step()

  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \     ],
@ -230,7 +230,7 @@ function! Test_Multiple_Threads_Step()
  call vimspector#StepOver()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -244,7 +244,7 @@ function! Test_Multiple_Threads_Step()

  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -257,7 +257,7 @@ function! Test_Multiple_Threads_Step()
  call vimspector#StepOver()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -273,7 +273,7 @@ function! Test_Multiple_Threads_Step()

  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -287,7 +287,7 @@ function! Test_Multiple_Threads_Step()
  call vimspector#StepOver()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -304,7 +304,7 @@ function! Test_Multiple_Threads_Step()

  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -319,7 +319,7 @@ function! Test_Multiple_Threads_Step()
  call vimspector#StepOver()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -338,7 +338,7 @@ function! Test_Multiple_Threads_Step()
  " So we break out of the loop
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, notify_l, 1 )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \         '+ Thread [0-9]\+: .* (paused)',
        \         '+ Thread [0-9]\+: .* (paused)',
@ -352,6 +352,209 @@ function! Test_Multiple_Threads_Step()
        \   )
        \ } )

+  call vimspector#ClearBreakpoints()
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction
+
+function! Test_UpDownStack()
+  let fn='../support/test/python/simple_python/main.py'
+  exe 'edit ' . fn
+  call setpos( '.', [ 0, 6, 1 ] )
+
+  call vimspector#SetLineBreakpoint( fn, 15 )
+  call vimspector#LaunchWithSettings( { 'configuration': 'run' } )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 15, 1 )
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \         '- Thread 1: MainThread (paused)',
+        \         '  2: DoSomething@main.py:15',
+        \         '  3: __init__@main.py:8',
+        \         '  4: Main@main.py:23',
+        \         '  5: <module>@main.py:29',
+        \     ],
+        \     GetBufLine( winbufnr( g:vimspector_session_windows.stack_trace ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+  call win_gotoid( g:vimspector_session_windows.stack_trace )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 1,
+          \ 'vimspectorCurrentThread',
+          \ 200 ) } )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 2,
+          \ 'vimspectorCurrentFrame',
+          \ 200 ) } )
+  wincmd w
+
+  call vimspector#DownFrame()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 15, 1 )
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \         '- Thread 1: MainThread (paused)',
+        \         '  2: DoSomething@main.py:15',
+        \         '  3: __init__@main.py:8',
+        \         '  4: Main@main.py:23',
+        \         '  5: <module>@main.py:29',
+        \     ],
+        \     GetBufLine( winbufnr( g:vimspector_session_windows.stack_trace ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+  call win_gotoid( g:vimspector_session_windows.stack_trace )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 1,
+          \ 'vimspectorCurrentThread',
+          \ 200 ) } )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 2,
+          \ 'vimspectorCurrentFrame',
+          \ 200 ) } )
+  wincmd w
+
+
+  call vimspector#UpFrame()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 8, 1 )
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \         '- Thread 1: MainThread (paused)',
+        \         '  2: DoSomething@main.py:15',
+        \         '  3: __init__@main.py:8',
+        \         '  4: Main@main.py:23',
+        \         '  5: <module>@main.py:29',
+        \     ],
+        \     GetBufLine( winbufnr( g:vimspector_session_windows.stack_trace ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+  call win_gotoid( g:vimspector_session_windows.stack_trace )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 1,
+          \ 'vimspectorCurrentThread',
+          \ 200 ) } )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 3,
+          \ 'vimspectorCurrentFrame',
+          \ 200 ) } )
+  wincmd w
+
+
+  call feedkeys( "\<Plug>VimspectorUpFrame", 'x' )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 23, 1 )
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \         '- Thread 1: MainThread (paused)',
+        \         '  2: DoSomething@main.py:15',
+        \         '  3: __init__@main.py:8',
+        \         '  4: Main@main.py:23',
+        \         '  5: <module>@main.py:29',
+        \     ],
+        \     GetBufLine( winbufnr( g:vimspector_session_windows.stack_trace ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+  call win_gotoid( g:vimspector_session_windows.stack_trace )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 1,
+          \ 'vimspectorCurrentThread',
+          \ 200 ) } )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 4,
+          \ 'vimspectorCurrentFrame',
+          \ 200 ) } )
+  wincmd w
+
+
+  call feedkeys( "\<Plug>VimspectorDownFrame", 'x' )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 8, 1 )
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \         '- Thread 1: MainThread (paused)',
+        \         '  2: DoSomething@main.py:15',
+        \         '  3: __init__@main.py:8',
+        \         '  4: Main@main.py:23',
+        \         '  5: <module>@main.py:29',
+        \     ],
+        \     GetBufLine( winbufnr( g:vimspector_session_windows.stack_trace ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+  call win_gotoid( g:vimspector_session_windows.stack_trace )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 1,
+          \ 'vimspectorCurrentThread',
+          \ 200 ) } )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 3,
+          \ 'vimspectorCurrentFrame',
+          \ 200 ) } )
+  wincmd w
+
+
+  call vimspector#DownFrame()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 15, 1 )
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \         '- Thread 1: MainThread (paused)',
+        \         '  2: DoSomething@main.py:15',
+        \         '  3: __init__@main.py:8',
+        \         '  4: Main@main.py:23',
+        \         '  5: <module>@main.py:29',
+        \     ],
+        \     GetBufLine( winbufnr( g:vimspector_session_windows.stack_trace ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+  call win_gotoid( g:vimspector_session_windows.stack_trace )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 1,
+          \ 'vimspectorCurrentThread',
+          \ 200 ) } )
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+          \ 'VimspectorStackTrace',
+          \ 2,
+          \ 'vimspectorCurrentFrame',
+          \ 200 ) } )
+  wincmd w
+
+
+
  call vimspector#ClearBreakpoints()
  call vimspector#test#setup#Reset()
  %bwipe!
--- 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/ui.test.vim
+++ b/tests/ui.test.vim
@ -1,6 +1,7 @@
 let s:fn='../support/test/python/simple_python/main.py'

 function! SetUp()
+  let g:vimspector_ui_mode = get( s:, 'vimspector_ui_mode', 'horizontal' )
  call vimspector#test#setup#SetUpWithMappings( 'HUMAN' )
 endfunction

@ -16,12 +17,17 @@ function! s:StartDebugging()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 23, 1 )
 endfunction

+function! SetUp_Test_StandardLayout()
+  call vimspector#test#setup#PushOption( 'columns', 200 )
+endfunction
+
 function! Test_StandardLayout()
  call s:StartDebugging()

  call vimspector#StepOver()
  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )

+  call assert_equal( 'horizontal', g:vimspector_session_windows.mode )
  call assert_equal(
        \ [ 'row', [
        \   [ 'col', [
@ -43,6 +49,247 @@ function! Test_StandardLayout()
  %bwipe!
 endfunction

+function! TearDown_Test_StandardLayout()
+  call vimspector#test#setup#PopOption( 'columns' )
+endfunction
+
+function! SetUp_Test_NarrowLayout()
+  call vimspector#test#setup#PushOption( 'columns', 100 )
+  let s:vimspector_ui_mode = 'vertical'
+endfunction
+
+function! Test_NarrowLayout()
+  call s:StartDebugging()
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
+
+  call assert_equal( 'vertical', g:vimspector_session_windows.mode )
+  call assert_equal(
+        \ [ 'col', [
+        \   [ 'row', [
+        \     [ 'leaf', g:vimspector_session_windows.variables ],
+        \     [ 'leaf', g:vimspector_session_windows.watches ],
+        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
+        \   ] ],
+        \   [ 'leaf', g:vimspector_session_windows.code ],
+        \   [ 'leaf', g:vimspector_session_windows.terminal ],
+        \   [ 'leaf', g:vimspector_session_windows.output ],
+        \ ] ],
+        \ winlayout( g:vimspector_session_windows.tabpage ) )
+
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction
+
+function! TearDown_Test_NarrowLayout()
+  unlet s:vimspector_ui_mode
+  call vimspector#test#setup#PopOption( 'columns' )
+endfunction
+
+function! SetUp_Test_AutoLayoutTerminalVert()
+  let s:vimspector_ui_mode = 'auto'
+  call vimspector#test#setup#PushOption( 'columns', 250 )
+  call vimspector#test#setup#PushOption( 'lines', 30 )
+endfunction
+
+function! Test_AutoLayoutTerminalVert()
+  call s:StartDebugging()
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
+
+  call assert_equal( 'horizontal', g:vimspector_session_windows.mode )
+  call assert_equal(
+        \ [ 'row', [
+        \   [ 'col', [
+        \     [ 'leaf', g:vimspector_session_windows.variables ],
+        \     [ 'leaf', g:vimspector_session_windows.watches ],
+        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
+        \   ] ],
+        \   [ 'col', [
+        \     [ 'row', [
+        \       [ 'leaf', g:vimspector_session_windows.code ],
+        \       [ 'leaf', g:vimspector_session_windows.terminal ],
+        \     ] ],
+        \     [ 'leaf', g:vimspector_session_windows.output ],
+        \   ] ]
+        \ ] ],
+        \ winlayout( g:vimspector_session_windows.tabpage ) )
+
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction
+
+function! TearDown_Test_AutoLayoutTerminalVert()
+  unlet s:vimspector_ui_mode
+  call vimspector#test#setup#PopOption( 'lines' )
+  call vimspector#test#setup#PopOption( 'columns' )
+endfunction
+
+function! SetUp_Test_AutoLayoutTerminalHorizVert()
+  let s:vimspector_ui_mode = 'auto'
+  " Wide enough to be horizontal layout, but not wide enough to fully fit the
+  " terminal, with enough rows to fit the max terminal below
+  call vimspector#test#setup#PushOption( 'columns',
+        \ 50 + 82 + 3 + 2 + 12 )
+  call vimspector#test#setup#PushOption( 'lines', 50 )
+endfunction
+
+function! Test_AutoLayoutTerminalHorizVert()
+  call s:StartDebugging()
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
+
+  call assert_equal( 'horizontal', g:vimspector_session_windows.mode )
+  call assert_equal(
+        \ [ 'row', [
+        \   [ 'col', [
+        \     [ 'leaf', g:vimspector_session_windows.variables ],
+        \     [ 'leaf', g:vimspector_session_windows.watches ],
+        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
+        \   ] ],
+        \   [ 'col', [
+        \     [ 'leaf', g:vimspector_session_windows.code ],
+        \     [ 'leaf', g:vimspector_session_windows.terminal ],
+        \     [ 'leaf', g:vimspector_session_windows.output ],
+        \   ] ]
+        \ ] ],
+        \ winlayout( g:vimspector_session_windows.tabpage ) )
+
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction
+
+function! TearDown_Test_AutoLayoutTerminalHorizVert()
+  unlet s:vimspector_ui_mode
+  call vimspector#test#setup#PopOption( 'lines' )
+  call vimspector#test#setup#PopOption( 'columns' )
+endfunction
+
+function! SetUp_Test_AutoLayoutTerminalHorizVertButNotEnoughLines()
+  let s:vimspector_ui_mode = 'auto'
+  " Wide enough to be horizontal layout, but not wide enough to fully fit the
+  " terminal, with enough rows to fit the max terminal below, but there are not
+  " enough lines to do this
+  call vimspector#test#setup#PushOption( 'columns',
+        \ 50 + 82 + 3 + 2 + 12 )
+  call vimspector#test#setup#PushOption( 'lines', 20 )
+endfunction
+
+function! Test_AutoLayoutTerminalHorizVertButNotEnoughLines()
+  call s:StartDebugging()
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
+
+  call assert_equal( 'horizontal', g:vimspector_session_windows.mode )
+  call assert_equal(
+        \ [ 'row', [
+        \   [ 'col', [
+        \     [ 'leaf', g:vimspector_session_windows.variables ],
+        \     [ 'leaf', g:vimspector_session_windows.watches ],
+        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
+        \   ] ],
+        \   [ 'col', [
+        \     [ 'row', [
+        \       [ 'leaf', g:vimspector_session_windows.code ],
+        \       [ 'leaf', g:vimspector_session_windows.terminal ],
+        \     ] ],
+        \     [ 'leaf', g:vimspector_session_windows.output ],
+        \   ] ],
+        \ ] ],
+        \ winlayout( g:vimspector_session_windows.tabpage ) )
+
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction
+
+function! TearDown_Test_AutoLayoutTerminalHorizVertButNotEnoughLines()
+  unlet s:vimspector_ui_mode
+  call vimspector#test#setup#PopOption( 'lines' )
+  call vimspector#test#setup#PopOption( 'columns' )
+endfunction
+
+function! SetUp_Test_AutoLayoutTerminalHoriz()
+  let s:vimspector_ui_mode = 'vertical'
+  " Vertical layout, but we split the terminal horizonally
+  call vimspector#test#setup#PushOption( 'columns', 200 )
+  call vimspector#test#setup#PushOption( 'lines', 50 )
+endfunction
+
+function! Test_AutoLayoutTerminalHoriz()
+  call s:StartDebugging()
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
+
+  call assert_equal( 'vertical', g:vimspector_session_windows.mode )
+  call assert_equal(
+        \ [ 'col', [
+        \   [ 'row', [
+        \     [ 'leaf', g:vimspector_session_windows.variables ],
+        \     [ 'leaf', g:vimspector_session_windows.watches ],
+        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
+        \   ] ],
+        \   [ 'row', [
+        \     [ 'leaf', g:vimspector_session_windows.code ],
+        \     [ 'leaf', g:vimspector_session_windows.terminal ],
+        \   ] ],
+        \   [ 'leaf', g:vimspector_session_windows.output ],
+        \ ] ],
+        \ winlayout( g:vimspector_session_windows.tabpage ) )
+
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction
+
+function! TearDown_Test_AutoLayoutTerminalHoriz()
+  unlet s:vimspector_ui_mode
+  call vimspector#test#setup#PopOption( 'lines' )
+  call vimspector#test#setup#PopOption( 'columns' )
+endfunction
+
+function! SetUp_Test_AutoLayoutTerminalVertVert()
+  let s:vimspector_ui_mode = 'auto'
+  " Not wide enough to go horizontal, but wide enough to put the terminal and
+  " code vertically split
+  call vimspector#test#setup#PushOption( 'columns', 80 )
+  call vimspector#test#setup#PushOption( 'lines', 50 )
+endfunction
+
+function! Test_AutoLayoutTerminalVertVert()
+  call s:StartDebugging()
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
+
+  call assert_equal( 'vertical', g:vimspector_session_windows.mode )
+  call assert_equal(
+        \ [ 'col', [
+        \   [ 'row', [
+        \     [ 'leaf', g:vimspector_session_windows.variables ],
+        \     [ 'leaf', g:vimspector_session_windows.watches ],
+        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
+        \   ] ],
+        \   [ 'leaf', g:vimspector_session_windows.code ],
+        \   [ 'leaf', g:vimspector_session_windows.terminal ],
+        \   [ 'leaf', g:vimspector_session_windows.output ],
+        \ ] ],
+        \ winlayout( g:vimspector_session_windows.tabpage ) )
+
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction
+
+function! TearDown_Test_AutoLayoutTerminalVertVert()
+  unlet s:vimspector_ui_mode
+  call vimspector#test#setup#PopOption( 'lines' )
+  call vimspector#test#setup#PopOption( 'columns' )
+endfunction
+
+
 function! Test_CloseVariables()
  call s:StartDebugging()

--- a/tests/variables.test.vim
+++ b/tests/variables.test.vim
@ -194,6 +194,7 @@ function! Test_ExpandVariables()
        \     [
        \       '- Scope: Locals',
        \       ' *+ t (Test): {...}',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -211,7 +212,7 @@ function! Test_ExpandVariables()
  call feedkeys( "\<CR>", 'xt' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '- Scope: Locals',
        \       ' \*- t (Test): {...}',
@ -219,6 +220,7 @@ 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,
@ -229,7 +231,7 @@ function! Test_ExpandVariables()
  " Step - stays expanded
  call vimspector#StepOver()
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '- Scope: Locals',
        \       '  - t (Test): {...}',
@ -237,6 +239,7 @@ 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,
@ -253,6 +256,7 @@ function! Test_ExpandVariables()
        \     [
        \       '- Scope: Locals',
        \       '  + t (Test): {...}',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -267,6 +271,7 @@ function! Test_ExpandVariables()
        \     [
        \       '- Scope: Locals',
        \       '  + t (Test): {...}',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -278,7 +283,7 @@ function! Test_ExpandVariables()
  call setpos( '.', [ 0, 2, 1 ] )
  call feedkeys( "\<CR>", 'xt' )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '- Scope: Locals',
        \       '  - t (Test): {...}',
@ -286,6 +291,7 @@ function! Test_ExpandVariables()
        \       '   \*- c (char): 99 ''c''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -302,6 +308,7 @@ function! Test_ExpandVariables()
        \   assert_equal(
        \     [
        \       '+ Scope: Locals',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -316,6 +323,7 @@ function! Test_ExpandVariables()
        \   assert_equal(
        \     [
        \       '+ Scope: Locals',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -331,6 +339,7 @@ function! Test_ExpandVariables()
        \   assert_equal(
        \     [
        \       '+ Scope: Locals',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -378,7 +387,7 @@ function! Test_ExpandWatch()
  call feedkeys( "\<CR>", 'xt' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Watches: ----',
        \       'Expression: t',
@ -397,7 +406,7 @@ function! Test_ExpandWatch()
  " Step - stays expanded
  call vimspector#StepOver()
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Watches: ----',
        \       'Expression: t',
@ -449,7 +458,7 @@ function! Test_ExpandWatch()
  call setpos( '.', [ 0, 3, 1 ] )
  call feedkeys( "\<CR>", 'xt' )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Watches: ----',
        \       'Expression: t',
@ -607,7 +616,7 @@ function! Test_EvaluateFailure()
  " Add a wtch
  call vimspector#AddWatch( 'test' )
  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Watches: ----',
        \       'Expression: test',
@ -658,7 +667,7 @@ function! Test_VariableEval()
        \ } )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '{...}',
        \       ' - i: 0',
@ -690,7 +699,7 @@ function! Test_VariableEval()
        \ } )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '{...}',
        \       ' - i: 0',
@ -724,7 +733,7 @@ function! Test_VariableEval()
        \ } )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Evaluation error',
        \     ],
@ -768,7 +777,7 @@ function! Test_VariableEvalExpand()
        \ } )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '{...}',
        \       ' - i: 0',
@ -786,7 +795,7 @@ function! Test_VariableEvalExpand()
  call feedkeys( "jjjj\<CR>", 'xt' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '{...}',
        \       ' - i: 0',
@ -806,7 +815,7 @@ function! Test_VariableEvalExpand()
  call feedkeys( "\<CR>", 'xt' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '{...}',
        \       ' - i: 0',
@ -846,6 +855,7 @@ function! Test_SetVariableValue_Local()
        \     [
        \       '- Scope: Locals',
        \       ' *+ t (Test): {...}',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -863,7 +873,7 @@ function! Test_SetVariableValue_Local()
  call feedkeys( "\<CR>", 'xt' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '- Scope: Locals',
        \       ' \*- t (Test): {...}',
@ -871,6 +881,7 @@ 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,
@ -889,7 +900,7 @@ with mock.patch( 'vimspector.utils.InputSave' ):
 EOF

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '- Scope: Locals',
        \       ' \*- t (Test): {...}',
@ -897,6 +908,7 @@ EOF
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -908,7 +920,7 @@ EOF
  call vimspector#SetVariableValue( '1234' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '- Scope: Locals',
        \       ' \*- t (Test): {...}',
@ -916,6 +928,7 @@ EOF
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -927,7 +940,7 @@ EOF
  call vimspector#SetVariableValue( 'this is invalid' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '- Scope: Locals',
        \       ' \*- t (Test): {...}',
@ -935,6 +948,7 @@ EOF
        \       '   \*- c (char): 0 ''\\0\{1,3}''',
        \       '   \*- fffff (float): 0',
        \       '   \*+ another_test (AnotherTest):\( {...}\)\?',
+        \       '+ Scope: Registers',
        \     ],
        \     getbufline( winbufnr( g:vimspector_session_windows.variables ),
        \                 1,
@ -983,7 +997,7 @@ function! Test_SetVariableValue_Watch()
  call feedkeys( "\<CR>", 'xt' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Watches: ----',
        \       'Expression: t',
@ -1012,7 +1026,7 @@ EOF


  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Watches: ----',
        \       'Expression: t',
@ -1032,7 +1046,7 @@ EOF
  call vimspector#SetVariableValue( '1234' )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       'Watches: ----',
        \       'Expression: t',
@ -1075,7 +1089,7 @@ function! Test_SetVariableValue_Balloon()
        \ } )

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '{...}',
        \       ' - i: 0',
@ -1102,7 +1116,7 @@ with mock.patch( 'vimspector.utils.InputSave' ):
 EOF

  call WaitForAssert( {->
-        \   AssertMatchist(
+        \   AssertMatchList(
        \     [
        \       '{...}',
        \       ' - i: 0',
Author	SHA1	Message	Date
Joey Yakimowich-Payne	7c12519b9d	Modify for mac m1	2021-09-10 10:30:44 -06:00
mergify[bot]	2bb8561eb6	Merge pull request #452 from seezer/readme-gdb-prettyprinter Readme: pretty printing with vscode-cpptools / gdb	2021-09-09 16:19:52 +00:00
mergify[bot]	a868102b5e	Merge branch 'master' into readme-gdb-prettyprinter	2021-09-09 16:05:28 +00:00
Sebastian Goth	dc862fe565	Readme: pretty printing with vscode-cpptools / gdb	2021-09-09 16:59:01 +02:00
Ben Jackson	b4bcfca932	Merge pull request #450 from puremourning/gha-ubuntu-18.04 Update to ubuntu 18.04 as 16.04 is deprecated	2021-09-08 22:49:22 +01:00
Ben Jackson	3df0602a69	Merge branch 'master' into gha-ubuntu-18.04	2021-09-08 22:30:49 +01:00
mergify[bot]	1c2dda4a6a	Merge pull request #449 from seezer/vscode-cpptools-1.6.0 Update vscode-cpptools from 0.27.0 to 1.6.0	2021-09-08 21:30:08 +00:00
Ben Jackson	db5ed8e802	Update to ubuntu 18.04 as 16.04 is deprecated	2021-09-08 22:20:33 +01:00
Sebastian Goth	17ca1522f8	Use correct spelling of MIMode in tests	2021-09-08 23:16:47 +02:00
Sebastian Goth	561a5b9aa2	Update variables tests to expect register scope vscode-cpptools 1.6.0 now reports an additional scope 'Registers' after 'Locals'.	2021-09-08 21:58:32 +02:00
Sebastian Goth	46cfdc678d	Update vscode-cpptools from 0.27.0 to 1.6.0	2021-09-08 21:58:32 +02:00
Ben Jackson	51d78fce5f	Note on using legacy vscode-dap	2021-09-07 17:00:04 +01:00
mergify[bot]	14f34ea6d1	Merge pull request #442 from roachsinai/master Fix error: E806: using Float as a String.	2021-08-20 18:09:07 +00:00
roachsinai	a720d0e1d5	Fix error: E806: using Float as a String.	2021-08-21 00:57:27 +08:00
Ben Jackson	7c7e3f9c3f	Add config for bash to tests	2021-08-20 11:17:05 +01:00
Ben Jackson	57ce099280	SHow the output in the console, as this is where codelldb puts it	2021-08-03 17:30:42 +01:00
mergify[bot]	27eb464b8e	Merge pull request #436 from puremourning/update-codelldb Update codelldb	2021-08-02 16:37:04 +00:00
Ben Jackson	f1e2c12e5b	Update codelldb Add a way to checksum downloads and a little guide to updating gadgets	2021-08-02 17:23:32 +01:00
mergify[bot]	26cd7c5c7e	Merge pull request #435 from przepompownia/upgrade-vscode-php-debug-1.17.0 Upgrade vscode-php-debug to 1.17.0	2021-08-02 14:51:01 +00:00
przepompownia	59c9cd10ab	Upgrade vscode-php-debug to 1.17.0	2021-08-02 16:11:04 +02:00
mergify[bot]	9c806d2a01	Merge pull request #429 from puremourning/dependabot/bundler/docs/addressable-2.8.0 Bump addressable from 2.7.0 to 2.8.0 in /docs	2021-07-13 15:07:15 +00:00
dependabot[bot]	3af97f1928	Bump addressable from 2.7.0 to 2.8.0 in /docs Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.7.0...addressable-2.8.0) --- updated-dependencies: - dependency-name: addressable dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-13 05:43:17 +00:00
mergify[bot]	da39c4955c	Merge pull request #422 from przepompownia/upgrade-vscode-php-debug-1.16.1 Upgrade vscode-php-debug to 1.16.1	2021-07-04 21:17:05 +00:00
przepompownia	21ebb22fd4	Upgrade vscode-php-debug to 1.16.1	2021-07-04 23:00:32 +02:00
mergify[bot]	aa0cddc0da	Merge pull request #420 from simondrake/master Add a runnable Go example	2021-06-24 16:05:30 +00:00
Simon Drake	5075f3a11a	Add a runnable Go example	2021-06-24 15:12:20 +01:00
mergify[bot]	bab81953d7	Merge pull request #414 from BaskovicP/patch-1 FIx typo in configuration.md	2021-06-09 18:24:31 +00:00
Paulo	0500e41429	FIx typo in configuration.md A small typo that wastes time for people that copy and modify the config file	2021-06-09 19:24:37 +02:00
mergify[bot]	1cbb400d42	Merge pull request #413 from przepompownia/vscode-php-debug-1.16.0 Upgrade vscode-php-debug to 1.16.0	2021-06-07 12:27:55 +00:00
przepompownia	5ea1f0d9d4	Upgrade vscode-php-debug to 1.16.0	2021-06-07 14:10:44 +02:00
Ben Jackson	a51b8b23c9	Fix traceback if the current frame isn't set	2021-05-25 14:53:29 +01:00
mergify[bot]	99c0c4f763	Merge pull request #409 from puremourning/dependabot/bundler/docs/nokogiri-1.11.5 Bump nokogiri from 1.11.3 to 1.11.5 in /docs	2021-05-20 11:10:01 +00:00
dependabot[bot]	daa8865fea	Bump nokogiri from 1.11.3 to 1.11.5 in /docs Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.3 to 1.11.5. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.5) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-20 10:56:04 +00:00
mergify[bot]	f4d756fe86	Merge pull request #406 from puremourning/debuginfo Add basic VimspectorDebugInfo command	2021-05-18 19:13:33 +00:00
Ben Jackson	d43904eb57	Add basic VimspectorDebugInfo command	2021-05-15 17:55:01 +01:00
Ben Jackson	aacd62f09f	Rename AssertMatchist -> AssertMatchList	2021-05-15 16:06:16 +01:00
Ben Jackson	0e9497ce8f	Add cpptools to cpp test proj	2021-05-15 15:55:17 +01:00
mergify[bot]	2708e8e6ec	Merge pull request #398 from przepompownia/php-debug-1.15.1 Upgrade php-debug to v1.15.1	2021-05-11 19:16:29 +00:00
Ben Jackson	adf6163653	Merge branch 'master' into php-debug-1.15.1	2021-05-11 20:05:48 +01:00
mergify[bot]	0af9d70b0d	Merge pull request #394 from puremourning/highlight-current-frame Add cursorline highlight for current frame	2021-05-11 18:56:14 +00:00
Ben Jackson	9113dbb698	stack_trace: Add cursorline highlight and sign for current frame	2021-05-11 19:44:42 +01:00
przepompownia	08679d1c3e	Upgrade php-debug to v1.15.1	2021-05-11 00:55:35 +02:00
Ben Jackson	4e04a862cb	Add note about existing github issues	2021-05-03 15:02:50 +01:00
Ben Jackson	a7e8e93920	Allow manual running of locker	2021-05-03 14:09:56 +01:00
Ben Jackson	2b84439413	Lock closed issues after 60 days	2021-05-03 14:09:14 +01:00
Ben Jackson	0c88cc8bad	Fix traceback when opening popup in neovim with log visible * We enter the popup window * some log data is received, so we update the log buffer and jump to the log window to scroll it * meanwhile, the WinLeave auto command on the popup window fires and closes the popup window * Having scrolled the log window, we try to jump back to the popup window, which by now has been closed. Fixes #390	2021-04-29 10:02:23 +01:00
mergify[bot]	a47d0b921c	Merge pull request #387 from lf-/typos Fix some typos in the readme	2021-04-22 12:19:58 +00:00
Jade	026ac22280	Fix some typos in the readme	2021-04-22 03:33:02 -07:00
Ben Jackson	297c0bea56	Ensure linux tests pass on PR	2021-04-20 20:52:53 +01:00
Ben Jackson	a9a26a5a60	Merge pull request #386 from puremourning/csharp-test Add tests for c# using netcoredbg	2021-04-15 23:23:19 +01:00
Ben Jackson	1e25313cb5	Switch to xcode 11 which apparently works with coreclr debugging https://github.com/dotnet/runtime/issues/42311#issuecomment-700718025	2021-04-15 23:04:31 +01:00
Ben Jackson	bc15c94513	Retire mono debug - never worked and seems abandoned, and vscode-python as it is serious legacy now	2021-04-15 21:39:38 +01:00
Ben Jackson	f389d65a24	Add a test for csharp, run in CI	2021-04-15 21:09:09 +01:00
Ben Jackson	b4195eee93	Upgrade to netcoredbg v1.2.0-782 Also upgrade the test project to LTS 3.1 dotnet framework, as MS is making it very difficult to get framework 2.2 anymore. Also remove some object files which apparently were included in the repo.	2021-04-15 18:02:55 +01:00
Ben Jackson	6ad9101cf2	Add FAQ about json files in each project.	2021-04-15 15:02:46 +01:00
Ben Jackson	a41db89523	Fix get_configurations test	2021-04-13 18:01:10 +01:00
Ben Jackson	dd88e051a4	Attempt to recover from broken messages	2021-04-13 17:35:04 +01:00
Ben Jackson	fa92c2a8d5	Add a mode for debugging the extremely flaky netcoredbg	2021-04-11 19:23:47 +01:00
mergify[bot]	6709b45c77	Merge pull request #382 from aqez/master Update sha256sum of netcoredbg for macos	2021-04-09 16:45:58 +00:00
Tony Dwire	278fc3cd8c	Update sha256sum of netcoredbg	2021-04-09 11:29:17 -05:00
Ben Jackson	13a5a1b947	Fix traceback when +python3 is not availble	2021-04-09 16:54:49 +01:00
Ben Jackson	7d83419a4f	Update docs bundles	2021-04-07 22:45:58 +01:00
mergify[bot]	7b3016aa90	Merge pull request #381 from aqez/master Updated netcoredbg to 1.2.0-761 to enable mac support of async/await	2021-04-07 17:33:27 +00:00
Tony Dwire	d70d51a614	Updated netcoredbg to 1.2.0-761 to enable mac support of async/await	2021-04-07 11:50:26 -05:00
mergify[bot]	caeb6610ed	Merge pull request #379 from puuuuh/master Update CodeLLDB	2021-03-30 18:13:03 +00:00
puh	0d9e7835a8	Update CodeLLDB	2021-03-30 00:16:58 +03:00
Ben Jackson	054ea35428	Add a way to test with dlv directly. Currrently not ready for the big time	2021-03-22 15:13:58 +00:00
Ben Jackson	244d7d8fdf	Add the reference material to the vim doc too	2021-03-22 14:45:21 +00:00
Ben Jackson	35e5b3d56e	Add vim doc based on README Use the following to recrate the doc: * clone https://github.com/ycm-core/vim-tools * create a venv and pip install the requierments * cd to vimspector dir * /path/to/vim-tools/html2vimdoc.py -f vimspector README.md > doc/vimspector.txt	2021-03-20 15:56:41 +00:00
Ben Jackson	842d9fbc2d	Config for pyright language server	2021-03-20 15:56:41 +00:00
mergify[bot]	6a24a17f2e	Merge pull request #371 from aqez/master Update netcoredbg to 1.2.0-738 to support async/await	2021-03-19 23:33:58 +00:00
Ben Jackson	91e0426e88	Merge branch 'master' into master	2021-03-19 23:20:41 +00:00
mergify[bot]	bf24b37190	Merge pull request #372 from puremourning/hot-code-replace Hot code replace for java	2021-03-19 23:15:34 +00:00
Ben Jackson	2d589475eb	Merge branch 'master' into master	2021-03-19 23:05:19 +00:00
Ben Jackson	1414f261a1	Documentation for hot code replace	2021-03-19 22:59:27 +00:00
Ben Jackson	a39017dd06	Fix actually sending terminateDebugee, and fix neovim 1-based index reporting	2021-03-19 18:43:45 +00:00
Ben Jackson	c05335c799	Make default option work for terminate debugee	2021-03-19 17:51:59 +00:00
Ben Jackson	efc5c76866	Fix lints	2021-03-19 17:51:59 +00:00
Ben Jackson	154e727b96	Make confirm dialog take arbitrary keys Confirm now takes the list of options, list of keys to select them and the default value. Returned values are always a 1-based index into the list (like SelectFromList) or -1 to mean esc/ctrl-c. This uses a nice popup dialog in vim and a crappy input on neovim.	2021-03-19 17:51:59 +00:00
Ben Jackson	6b74e584d5	Create a messagebox-like interface in vim	2021-03-19 17:51:59 +00:00
Ben Jackson	85bb8594ab	Allow forcing selection from the menu with <leader>F5	2021-03-19 17:51:59 +00:00
Ben Jackson	63fd3165fb	Use popup for confirmations (note these have to be async)	2021-03-19 17:51:59 +00:00
Ben Jackson	afb912dd08	Print hotcodereplace messages	2021-03-19 17:51:59 +00:00
Ben Jackson	b92a89f0d4	Add a way to have adapter specific message handlers	2021-03-19 17:51:59 +00:00
Ben Jackson	6f88b400e1	Only disable mappings in the keyboard-version of the popup	2021-03-18 13:51:32 +00:00
mergify[bot]	af2670ef9a	Merge pull request #373 from puremourning/fix-calculus Fix default variable values having substitutions from the calculus	2021-03-12 22:22:51 +00:00
mergify[bot]	2b24611036	Merge branch 'master' into fix-calculus	2021-03-12 22:08:52 +00:00
mergify[bot]	d84ebdd0ee	Merge pull request #375 from puremourning/up-down-stack Add commands to navigate up/down the stack in focussed thread.	2021-03-12 22:08:46 +00:00
Ben Jackson	6b67d165b9	Update docs for new mappings	2021-03-12 21:50:37 +00:00
Ben Jackson	a53d68f043	Add up and down frame mappings	2021-03-12 21:27:56 +00:00
Ben Jackson	6d3f3e207b	Fix default variable values having substitutions from the calculus	2021-03-12 20:15:45 +00:00
mergify[bot]	5716bbefa9	Merge pull request #369 from puremourning/narrow-mode Narrow UI mode	2021-03-11 21:38:40 +00:00
Ben Jackson	2615cff97a	If there isn't enough vertical space, we get vim errors (not enough room), so don't do that	2021-03-11 21:14:30 +00:00
Ben Jackson	01ea50cb70	use --clean for minimal vimrc	2021-03-11 21:13:58 +00:00
Ben Jackson	7d2770f3c4	Add vertical (i.e. narrow) layout This puts the 3 utility windows at the top, horizontally split, with the code view below. The terminal window is drawn either vertically split (if there's room) or horizontally split otherwise. The output window remains at tht bottom. We add equivalent sizing options too, setting some defauts that roughly work on my macbook pro. We try to guess the best layout to use. In particular we go into 'narrow' mode if there are not enough horizonal columns to fit the sidebar, code and at least the minimum terminal size. We also try to move the terminal to be horizontally spit (i.e. vertically stacked) if we can fit the max number of lines, but only the min number of columns. This is all a little heuristic, but when testing it myself, it feels good and tends to pick a good option by default. Users can always customise the ui mode (g:vimspector_ui_mode and all the various specific width options)	2021-03-10 23:44:45 +00:00
Tony Dwire	2a635294d0	Fix wrong version number for macos version.	2021-03-09 20:11:58 -06:00
Tony Dwire	38c843219e	Updated file name for netcoredbg to reflect new filename. Overrode version for macos since there is no new build for it yet.	2021-03-09 19:55:38 -06:00
Tony Dwire	c012f9520e	Updated netcoredbg to 1.2.0-738	2021-03-09 19:45:27 -06:00