WIP: Attempt to make restart work for CodeLLDB by flushing the channel on closedown - doesn't

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,12 +17,12 @@ assignees: ''
 
 > Please answer the following questions
 
-* Does your issue reproduce using `vim --clean -Nu /path/to/vimspector/support/minimal_vimrc` ? \[Yes/No]
+* Does your issue reproduce using `vim -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 ---clean Nu /path/to/vimspector/support/minimal_vimrc`
+> 1. Run `vim -Nu /path/to/vimspector/support/minimal_vimrc`
 > 2. Open _this project_...
 > 3. Press _this sequence of keys_
 
@@ -57,12 +57,6 @@ 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`
 
 ```

.github/ISSUE_TEMPLATE/config.yml

@@ -1,12 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Questions and support
-    url: http://gitter.im/vimspector/Lobby
-    about: Please ask and answer questions here.
-  - name: Discussions
-    url: https://github.com/puremourning/vimspector/discussions
-    about: Please post questions and useful hints here
-  - name: Support for additional languages
-    url: https://github.com/puremourning/vimspector/wiki/languages
-    about: Please see here for information on support for additional languages
-

.github/workflows/build.yaml

@@ -13,7 +13,7 @@ defaults:
 
 jobs:
   PythonLint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-16.04
     container: 'puremourning/vimspector:test'
     steps:
     - uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
     - name: 'Run flake8'
       run: '$HOME/.local/bin/flake8 python3/ *.py'
   VimscriptLint:
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-16.04'
     container: 'puremourning/vimspector:test'
     steps:
     - uses: actions/checkout@v2
@@ -32,13 +32,12 @@ jobs:
       run: $HOME/.local/bin/vint autoload/ compiler/ plugin/ tests/ syntax/
 
   Linux:
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-16.04'
     container:
       image: 'puremourning/vimspector:test'
       options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v2
-
     - run: |
         eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
         go get -u github.com/go-delve/delve/cmd/dlv
@@ -80,26 +79,17 @@ jobs:
         name: 'package-linux'
         path: 'package/linux-${{ github.run_id }}.tar.gz'
 
-    # - name: Start SSH session if failed
-    #   uses: luchihoratiu/debug-via-ssh@main
-    #   if: failure()
-    #   with:
-    #     NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
-    #     SSH_PASS: ${{ secrets.SSH_PASS }}
-
   MacOS:
     runs-on: 'macos-10.15'
     steps:
     - uses: actions/checkout@v2
-
     - run: |
-        brew update-reset
+        brew update
         brew doctor || true
-        for p in python@3.8 tcl-tk llvm lua luajit love; do
-          brew install $p || brew outdated $p || brew upgrade $p
+        for p in macvim tcl-tk llvm; do
+          brew install $p
+          brew outdated $p || brew upgrade $p
         done
-        brew install --cask macvim
-        brew link --overwrite python@3.8
       name: 'Install vim and deps'
 
     - run: go get -u github.com/go-delve/delve/cmd/dlv
@@ -111,16 +101,6 @@ 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'
 
@@ -148,15 +128,8 @@ jobs:
         name: 'package-macos'
         path: 'package/macos-${{ github.run_id }}.tar.gz'
 
-    # - name: Start SSH session if failed
-    #   uses: luchihoratiu/debug-via-ssh@main
-    #   if: failure()
-    #   with:
-    #     NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
-    #     SSH_PASS: ${{ secrets.SSH_PASS }} # [V]imspector
-
   PublishRelease:
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-16.04'
     needs:
       - Linux
       - MacOS

.github/workflows/lock_old_issues.yaml

@@ -1,27 +0,0 @@
-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'

.gitignore

@@ -6,7 +6,6 @@ tests/*.res
 tests/messages
 tests/debuglog
 test.log
-*.testlog
 gadgets/
 package/
 *.pyc
@@ -20,4 +19,3 @@ support/test/csharp/*.exe*
 configurations/
 venv/
 test-base/
-tags

.mergify.yml

@@ -9,8 +9,9 @@ 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

.ycm_extra_conf.py

@@ -42,17 +42,7 @@ 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:

CONTRIBUTING.md

@@ -46,23 +46,6 @@ 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:
 
@@ -70,7 +53,6 @@ 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
@@ -101,47 +83,11 @@ in the issue report.
 The minimal vimrc is in `support/test/minimal_vimrc` and can be used as follows:
 
 ```
-vim --clean -Nu /path/to/vimspector/support/minimal_vimrc
+vim -Nu /path/to/vimspector/support/minimal_vimrc
 ```
 
 ## Pull Requests
 
-Vimspector is open to all contributors with ideas great and small! However,
-there is a limit to the intended scope of the plugin and the amount of time the
-maintainer has to support and... well... maintain features. It's probably well
-understood that the contributor's input typically ends when a PR is megred, but
-the maintainers have to keep it working forever.
-
-### Small changes
-
-For bug fixes, documentation changes, gadget versin updates, etc. please just
-send a PR, I'm super happy to merge these!
-
-If you are unsure, or looking for some pointers, feel free to ask in Gitter, or
-mention is in the PR.
-
-### Larger changes
-
-For larger features that might be in any way controvertial, or increase the
-complexity of the overall plugin, please come to Gitter and talk to the
-maintainer(s) first. This saves a lot of potential back-and-forth and makes sure
-that we're "on the same page" about the idea and the ongoing maintenance.
-
-In addition, if you like hacking, feel free to raise a PR tagged with `[RFC]` in
-the title and we can discuss the idea. I still prefer to discuss these things on
-Gitter rather than back-and-forth on GitHub, though.
-
-Please don't be offended if the maintainer(s) request significant rework for (or
-perhaps even dismiss) a PR that's not gone through this process.
-
-Please also don't be offended if the maintainer(s) ask if you're willing to
-provide ongoing support for the feature. As an OSS project manned entirely in
-what little spare time the maintainer(s) have, we're always looking for
-contributions and contributors who will help with support and maintenance of
-larger new features.
-
-### PR Guidelines
-
 When contributing pull requests, I ask that:
 
 * You provide a clear and complete summary of the change, the use case and how
@@ -149,8 +95,6 @@ When contributing pull requests, I ask that:
 * You avoid using APIs that are not available in the versions listed in the
   dependencies on README.md
 * You add tests for your PR.
-* You test your changes in both Vim and Neovim at the supported versions (and
-  state that in the PR).
 * You follow the style of the code as-is; the python code is YCM-stye, it is
   *not* PEP8, nor should it be.
 
@@ -185,10 +129,10 @@ Vimspector creator.
 ### Code Style
 
 The code style of the Python code is "YCM" style, because that's how I like it.
-`flake8` is used to check for certain errors and code style.
+[`flake8`][] is used to check for certain errors and code style.
 
 The code style of the Vimscript is largely the same, and it is linted by
-`vint`.
+[`vint`][].
 
 To run them:
 
@@ -200,31 +144,7 @@ To run them:
 
 They're also run by CI, so please check for lint failures. The canonical
 definition of the command to run is the command run in CI, i.e. in
-`.git/workflows/build.yml`.
-
-### Debugging Vimspector
-
-You can debug vimspector's python code using vimspector! We can use debugpy,
-from within Vim's embedded python and connect to it. Here's how:
-
-1. In one instance of vim, run the following to get debugpy to start listening
-   for us to connect: `:py3 __import__( 'vimspector', fromlist=[ 'developer' ]
-   ).developer.SetUpDebugpy()`
-
-2. In another instance of Vim, set a breakpoint in the vimspector python code
-   you want to debug and launch vimspector (e.g. `<F5>`). Select the `Python:
-   attach to vim` profile. This will attach to the debugpy running in the other
-   vim.
-
-3. Back in the first vim (the debuggee), trigger the vimspector code in
-   question, e.g. by starting to debug something else.
-
-4. You'll see it pause, and the 2nd vim (the debugger), you should be able to
-   step through and inspect as with any other python remote debugging.
-
-NB. It's also possible to debug the vimscript code using vimspector, but this
-requires unreleased vim patches and a fair amount of faff. You can always use
-`:debug` (see the help) for this though. 
+`azure-pipelines.yml`.
 
 # Code of conduct
 

autoload/vimspector.vim

@@ -13,9 +13,6 @@
 " 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
@@ -30,62 +27,45 @@ EOF
 endfunction
 
 
-let s:enabled = v:null
+let s:enabled = vimspector#internal#state#Reset()
 
-function! s:Initialised() abort
-  return s:enabled != v:null
-endfunction
-
-function! s:Enabled() abort
-  if !s:Initialised()
-    let s:enabled = vimspector#internal#state#Reset()
-  endif
-
-  return s:enabled
-endfunction
-
-function! vimspector#Launch( ... ) abort
-  if !s:Enabled()
+function! vimspector#Launch() abort
+  if !s:enabled
     return
   endif
-  py3 _vimspector_session.Start( *vim.eval( 'a:000' ) )
+  py3 _vimspector_session.Start()
 endfunction
 
 function! vimspector#LaunchWithSettings( settings ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.Start( launch_variables = vim.eval( 'a:settings' ) )
 endfunction
 
-function! vimspector#Reset( ... ) abort
-  if !s:Enabled()
+function! vimspector#Reset() abort
+  if !s:enabled
     return
   endif
-  if a:0 == 0
-    let options = {}
-  else
-    let options = a:1
-  endif
-  py3 _vimspector_session.Reset( **vim.eval( 'options' ) )
+  py3 _vimspector_session.Reset()
 endfunction
 
 function! vimspector#Restart() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.Restart()
 endfunction
 
 function! vimspector#ClearBreakpoints() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.ClearBreakpoints()
 endfunction
 
 function! vimspector#ToggleBreakpoint( ... ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   if a:0 == 0
@@ -96,43 +76,8 @@ function! vimspector#ToggleBreakpoint( ... ) abort
   py3 _vimspector_session.ToggleBreakpoint( vim.eval( 'options' ) )
 endfunction
 
-function! vimspector#SetLineBreakpoint( file_name, line_num, ... ) abort
-  if !s:Enabled()
-    return
-  endif
-  if a:0 == 0
-    let options = {}
-  else
-    let options = a:1
-  endif
-  py3 _vimspector_session.SetLineBreakpoint(
-        \ vim.eval( 'a:file_name' ),
-        \ int( vim.eval( 'a:line_num' ) ),
-        \ vim.eval( 'options' ) )
-endfunction
-
-function! vimspector#ClearLineBreakpoint( file_name, line_num ) abort
-  if !s:Enabled()
-    return
-  endif
-  py3 _vimspector_session.ClearLineBreakpoint(
-        \ vim.eval( 'a:file_name' ),
-        \ int( vim.eval( 'a:line_num' ) ) )
-endfunction
-
-
-function! vimspector#RunToCursor() abort
-  if !s:Enabled()
-    return
-  endif
-  py3 _vimspector_session.RunTo(
-        \ vim.eval( "expand( '%' )" ),
-        \ int( vim.eval( "line( '.' )" ) ) )
-endfunction
-
-
 function! vimspector#AddFunctionBreakpoint( function, ... ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   if a:0 == 0
@@ -145,120 +90,74 @@ function! vimspector#AddFunctionBreakpoint( function, ... ) abort
 endfunction
 
 function! vimspector#StepOver() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.StepOver()
 endfunction
 
 function! vimspector#StepInto() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.StepInto()
 endfunction
 
 function! vimspector#StepOut() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.StepOut()
 endfunction
 
 function! vimspector#Continue() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.Continue()
 endfunction
 
 function! vimspector#Pause() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.Pause()
 endfunction
 
-function! vimspector#PauseContinueThread() abort
-  if !s:Enabled()
+function! vimspector#Stop() abort
+  if !s:enabled
     return
   endif
-  py3 _vimspector_session.PauseContinueThread()
-endfunction
-
-function! vimspector#SetCurrentThread() abort
-  if !s:Enabled()
-    return
-  endif
-  py3 _vimspector_session.SetCurrentThread()
-endfunction
-
-function! vimspector#Stop( ... ) abort
-  if !s:Enabled()
-    return
-  endif
-  if a:0 == 0
-    let options = {}
-  else
-    let options = a:1
-  endif
-  py3 _vimspector_session.Stop( **vim.eval( 'options' ) )
+  py3 _vimspector_session.Stop()
 endfunction
 
 function! vimspector#ExpandVariable() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.ExpandVariable()
 endfunction
 
-function! vimspector#SetVariableValue( ... ) abort
-  if !s:Enabled()
-    return
-  endif
-  if a:0 == 0
-    py3 _vimspector_session.SetVariableValue()
-  else
-    py3 _vimspector_session.SetVariableValue( new_value = vim.eval( 'a:1' ) )
-  endif
-endfunction
-
 function! vimspector#DeleteWatch() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.DeleteWatch()
 endfunction
 
 function! vimspector#GoToFrame() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   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()
+  if !s:enabled
     return
   endif
   if a:0 == 0
-    let expr = input( 'Enter watch expression: ',
-                    \ '',
-                    \ 'custom,vimspector#CompleteExpr' )
+    let expr = input( 'Enter watch expression: ' )
   else
     let expr = a:1
   endif
@@ -271,7 +170,7 @@ function! vimspector#AddWatch( ... ) abort
 endfunction
 
 function! vimspector#AddWatchPrompt( expr ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   stopinsert
@@ -280,24 +179,24 @@ function! vimspector#AddWatchPrompt( expr ) abort
 endfunction
 
 function! vimspector#Evaluate( expr ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.ShowOutput( 'Console' )
-  py3 _vimspector_session.EvaluateConsole( vim.eval( 'a:expr' ), True )
+  py3 _vimspector_session.EvaluateConsole( vim.eval( 'a:expr' ) )
 endfunction
 
 function! vimspector#EvaluateConsole( expr ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   stopinsert
   setlocal nomodified
-  py3 _vimspector_session.EvaluateConsole( vim.eval( 'a:expr' ), False )
+  py3 _vimspector_session.EvaluateConsole( vim.eval( 'a:expr' ) )
 endfunction
 
 function! vimspector#ShowOutput( ... ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   if a:0 == 1
@@ -308,7 +207,7 @@ function! vimspector#ShowOutput( ... ) abort
 endfunction
 
 function! vimspector#ShowOutputInWindow( win_id, category ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 __import__( 'vimspector',
@@ -318,31 +217,21 @@ function! vimspector#ShowOutputInWindow( win_id, category ) abort
 endfunction
 
 function! vimspector#ToggleLog() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.ToggleLog()
 endfunction
 
 function! vimspector#ListBreakpoints() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   py3 _vimspector_session.ListBreakpoints()
 endfunction
 
-function! vimspector#GetConfigurations() abort
-  if !s:Enabled()
-    return
-  endif
-  let configurations = py3eval(
-        \ 'list( _vimspector_session.GetConfigurations( {} )[ 1 ].keys() )'
-        \ . ' if _vimspector_session else []' )
-  return configurations
-endfunction
-
 function! vimspector#CompleteOutput( ArgLead, CmdLine, CursorPos ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   let buffers = py3eval( '_vimspector_session.GetOutputBuffers() '
@@ -350,15 +239,37 @@ function! vimspector#CompleteOutput( ArgLead, CmdLine, CursorPos ) abort
   return join( buffers, "\n" )
 endfunction
 
+py3 <<EOF
+def _vimspector_GetExprCompletions( ArgLead, prev_non_keyword_char ):
+  if not _vimspector_session:
+    return []
+
+  items = []
+  for candidate in _vimspector_session.GetCompletionsSync(
+    ArgLead,
+    prev_non_keyword_char ):
+
+    label = candidate.get( 'text', candidate[ 'label' ] )
+
+    start = prev_non_keyword_char - 1
+
+    if 'start' in candidate and 'length' in candidate:
+      start = candidate[ 'start' ]
+
+    items.append( ArgLead[ 0 : start ] + label )
+
+  return items
+EOF
+
 function! vimspector#CompleteExpr( ArgLead, CmdLine, CursorPos ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
 
   let col = len( a:ArgLead )
   let prev_non_keyword_char = match( a:ArgLead[ 0 : col - 1 ], '\k*$' ) + 1
 
-  return join( py3eval( '_vimspector_session.GetCommandLineCompletions( '
+  return join( py3eval( '_vimspector_GetExprCompletions( '
                       \ . 'vim.eval( "a:ArgLead" ), '
                       \ . 'int( vim.eval( "prev_non_keyword_char" ) ) )' ),
              \ "\n" )
@@ -479,7 +390,7 @@ function! vimspector#OmniFuncConsole( find_start, query ) abort
 endfunction
 
 function! vimspector#Install( bang, ... ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   let prefix = vimspector#internal#state#GetAPIPrefix()
@@ -491,7 +402,7 @@ function! vimspector#Install( bang, ... ) abort
 endfunction
 
 function! vimspector#CompleteInstall( ArgLead, CmdLine, CursorPos ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
   return py3eval( '"\n".join('
@@ -501,7 +412,7 @@ function! vimspector#CompleteInstall( ArgLead, CmdLine, CursorPos ) abort
 endfunction
 
 function! vimspector#Update( bang, ... ) abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
 
@@ -514,7 +425,7 @@ function! vimspector#Update( bang, ... ) abort
 endfunction
 
 function! vimspector#AbortInstall() abort
-  if !s:Enabled()
+  if !s:enabled
     return
   endif
 
@@ -523,49 +434,6 @@ function! vimspector#AbortInstall() abort
 endfunction
 
 
-function! vimspector#OnBufferCreated( file_name ) abort
-  if len( a:file_name ) == 0
-    return
-  endif
-
-  " Don't actually load up vimsepctor python in autocommands that trigger
-  " regularly. We'll only create the session obkect in s:Enabled()
-  if !s:Initialised()
-    return
-  endif
-
-  if !s:Enabled()
-    return
-  endif
-
-  py3 _vimspector_session.RefreshSigns( vim.eval( 'a:file_name' ) )
-endfunction
-
-function! vimspector#ShowEvalBalloon( is_visual ) abort
-  if a:is_visual
-    let expr = py3eval( '__import__( "vimspector", fromlist = [ "utils" ] )'
-                      \ . '.utils.GetVisualSelection('
-                      \ . '    int( vim.eval( "winbufnr( winnr() )" ) ) )' )
-    let expr = join( expr, '\n' )
-  else
-    let expr = expand( '<cexpr>' )
-  endif
-
-  return py3eval( '_vimspector_session.ShowEvalBalloon('
-                \ . ' int( vim.eval( "winnr()" ) ), "'
-                \ . expr
-                \ . '", 0 )' )
-endfunction
-
-function! vimspector#PrintDebugInfo() abort
-  if !s:Enabled()
-    return
-  endif
-
-  py3 _vimspector_session.PrintDebugInfo()
-endfunction
-
-
 " Boilerplate {{{
 let &cpoptions=s:save_cpo
 unlet s:save_cpo

autoload/vimspector/internal/balloon.vim

@@ -19,323 +19,16 @@ let s:save_cpo = &cpoptions
 set cpoptions&vim
 " }}}
 
-scriptencoding utf-8
-
-let s:popup_win_id = 0
-let s:nvim_border_win_id = 0
-"
-" tooltip dimensions
-let s:min_width = 1
-let s:min_height = 1
-let s:max_width = 80
-let s:max_height = 20
-
-let s:is_neovim = has( 'nvim' )
-
-
-" This is used as the balloonexpr in vim to show the Tooltip at the hover
-" position
-function! vimspector#internal#balloon#HoverTooltip() abort
-  return py3eval( '_vimspector_session.ShowEvalBalloon('
-                \ . ' int( vim.eval( "v:beval_winnr" ) ) + 1,'
-                \ . ' vim.eval( "v:beval_text"),'
-                \ . ' 1 )' )
+" Returns: py.ShowBalloon( winnr, expresssion )
+function! vimspector#internal#balloon#BalloonExpr() abort
+  " winnr + 1 because for *no good reason* winnr is 0 based here unlike
+  " everywhere else
+  " int() because for *no good reason* winnr is a string.
+  return py3eval('_vimspector_session.ShowBalloon('
+        \ . 'int( vim.eval( "v:beval_winnr" ) ) + 1,'
+        \ . 'vim.eval( "v:beval_text" ) )' )
 endfunction
 
-function! vimspector#internal#balloon#CreateTooltip( is_hover, ... ) abort
-  let body = []
-  if a:0 > 0
-    let body = a:1
-  endif
-
-  if s:popup_win_id != 0
-    call vimspector#internal#balloon#Close()
-  endif
-
-  if s:is_neovim
-    call s:CreateNeovimTooltip( body )
-  else
-    let config = {
-      \ 'wrap': 0,
-      \ 'filtermode': 'n',
-      \ 'maxwidth': s:max_width,
-      \ 'maxheight': s:max_height,
-      \ 'minwidth': s:min_width,
-      \ 'minheight': s:min_height,
-      \ 'scrollbar': 1,
-      \ 'border': [],
-      \ 'padding': [ 0, 1, 0, 1],
-      \ 'drag': 1,
-      \ 'resize': 1,
-      \ 'close': 'button',
-      \ 'callback': 'vimspector#internal#balloon#CloseCallback',
-      \ }
-
-    let config = vimspector#internal#popup#SetBorderChars( config )
-
-    if a:is_hover
-      let config[ 'filter' ] = 'vimspector#internal#balloon#MouseFilter'
-      let config[ 'mousemoved' ] = [ 0, 0, 0 ]
-      let s:popup_win_id = popup_beval( body, config )
-    else
-      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
-
-  endif
-
-  return s:popup_win_id
-endfunction
-
-" Filters for vim {{{
-function! vimspector#internal#balloon#MouseFilter( winid, key ) abort
-  if a:key ==# "\<Esc>"
-    call vimspector#internal#balloon#Close()
-    return 0
-  endif
-
-  if index( [ "\<leftmouse>", "\<2-leftmouse>" ], a:key ) < 0
-    return 0
-  endif
-
-  let handled = 0
-  let mouse_coords = getmousepos()
-
-  " close the popup if mouse is clicked outside the window
-  if mouse_coords[ 'winid' ] != a:winid
-    call vimspector#internal#balloon#Close()
-    return 0
-  endif
-
-  " place the cursor according to the click
-  call win_execute( a:winid,
-                  \ ':call cursor( '
-                  \ . mouse_coords[ 'line' ]
-                  \ . ', '
-                  \ . mouse_coords[ 'column' ]
-                  \ . ' )' )
-
-  " expand the variable if we got double click
-  if a:key ==? "\<2-leftmouse>"
-    call py3eval( '_vimspector_session.ExpandVariable('
-                \ . 'buf = vim.buffers[ ' .  winbufnr( a:winid ) . ' ],'
-                \ . 'line_num = ' . line( '.', a:winid )
-                \ . ')' )
-    let handled = 1
-  endif
-
-  return handled
-endfunction
-
-function! s:MatchKey( key, candidates ) abort
-  for candidate in a:candidates
-    " If the mapping string looks like a special character, then try and
-    " expand it. This is... a hack. The whole thing only works if the mapping
-    " is a single key (anyway), and so we assume any string starting with < is a
-    " special key (which will be the common case) and try and map it. If it
-    " fails... it fails.
-    if candidate[ 0 ] == '<'
-      try
-        execute 'let candidate = "\' . candidate . '"'
-      endtry
-    endif
-
-    if candidate ==# a:key
-      return v:true
-    endif
-  endfor
-
-  return v:false
-endfunction
-
-function! vimspector#internal#balloon#CursorFilter( winid, key ) abort
-  let mappings = py3eval(
-        \ "__import__( 'vimspector',"
-        \."            fromlist = [ 'settings' ] ).settings.Dict("
-        \."              'mappings' )[ 'variables' ]" )
-
-  if index( [ "\<LeftMouse>", "\<2-LeftMouse>" ], a:key ) >= 0
-    return vimspector#internal#balloon#MouseFilter( a:winid, a:key )
-  endif
-
-  if s:MatchKey( a:key, mappings.expand_collapse )
-    call py3eval( '_vimspector_session.ExpandVariable('
-                \ . 'buf = vim.buffers[ ' .  winbufnr( a:winid ) . ' ],'
-                \ . 'line_num = ' . line( '.', a:winid )
-                \ . ')' )
-    return 1
-  elseif s:MatchKey( a:key, mappings.set_value )
-    call py3eval( '_vimspector_session.SetVariableValue('
-                \ . 'buf = vim.buffers[ ' .  winbufnr( a:winid ) . ' ],'
-                \ . 'line_num = ' . line( '.', a:winid )
-                \ . ')' )
-    return 1
-  endif
-
-  return popup_filter_menu( a:winid, a:key )
-endfunction
-
-" }}}
-
-" Closing {{{
-
-function! vimspector#internal#balloon#CloseCallback( ... ) abort
-  let s:popup_win_id = 0
-  let s:nvim_border_win_id = 0
-  return py3eval( '_vimspector_session.CleanUpTooltip()' )
-endfunction
-
-function! vimspector#internal#balloon#Close() abort
-  if s:popup_win_id == 0
-    return
-  endif
-
-  if s:is_neovim
-    call nvim_win_close( s:popup_win_id, v:true )
-    call nvim_win_close( s:nvim_border_win_id, v:true )
-
-    call vimspector#internal#balloon#CloseCallback()
-  else
-    call popup_close(s:popup_win_id)
-  endif
-endfunction
-
-" }}}
-
-" Neovim pollyfill {{{
-
-function! vimspector#internal#balloon#ResizeTooltip() abort
-  if !s:is_neovim
-    " Vim does this for us
-    return
-  endif
-
-  if s:popup_win_id <= 0 || s:nvim_border_win_id <= 0
-    " nothing to resize
-    return
-  endif
-
-  noautocmd call win_gotoid( s:popup_win_id )
-  let buf_lines = getline( 1, '$' )
-
-  let width = s:min_width
-  let height = min( [ max( [ s:min_height, len( buf_lines ) ] ),
-                  \   s:max_height ] )
-
-  " calculate the longest line
-  for l in buf_lines
-    let width = max( [ width, len( l ) ] )
-  endfor
-
-  let width = min( [ width, s:max_width ] )
-
-  let opts = {
-        \ 'width': width,
-        \ 'height': height,
-        \ }
-
-  " resize the content window
-  call nvim_win_set_config( s:popup_win_id, opts )
-
-  " resize the border window
-  let opts[ 'width' ] = width + 4
-  let opts[ 'height' ] = height + 2
-
-  call nvim_win_set_config( s:nvim_border_win_id, opts )
-  call nvim_buf_set_lines( nvim_win_get_buf( s:nvim_border_win_id ),
-                         \ 0,
-                         \ -1,
-                         \ v:true,
-                         \ s:GenerateBorder( width, height ) )
-endfunction
-
-" neovim doesn't have the border support, so we have to make our own.
-" FIXME: This will likely break if the user has `ambiwidth=2`
-function! s:GenerateBorder( width, height ) abort
-
-  let top = '╭' . repeat('─',a:width + 2) . '╮'
-  let mid = '│' . repeat(' ',a:width + 2) . '│'
-  let bot = '╰' . repeat('─',a:width + 2) . '╯'
-  let lines = [ top ] + repeat( [ mid ], a:height ) + [ bot ]
-
-  return lines
-endfunction
-
-function! s:CreateNeovimTooltip( body ) abort
-  " generate border for the float window by creating a background buffer and
-  " overlaying the content buffer
-  " see https://github.com/neovim/neovim/issues/9718#issuecomment-546603628
-  let buf_id = nvim_create_buf( v:false, v:true )
-  call nvim_buf_set_lines( buf_id,
-                         \ 0,
-                         \ -1,
-                         \ v:true,
-                         \ s:GenerateBorder( s:max_width, s:max_height ) )
-
-  " default the dimensions initially, then we'll calculate the real size and
-  " resize it.
-  let opts = {
-        \ 'relative': 'cursor',
-        \ 'width': s:max_width + 2,
-        \ 'height': s:max_height + 2,
-        \ 'col': 0,
-        \ 'row': 1,
-        \ 'anchor': 'NW',
-        \ 'style': 'minimal'
-        \ }
-
-  " this is the border window
-  let s:nvim_border_win_id = nvim_open_win( buf_id, 0, opts )
-  call nvim_win_set_option( s:nvim_border_win_id, 'signcolumn', 'no' )
-  call nvim_win_set_option( s:nvim_border_win_id, 'relativenumber', v:false )
-  call nvim_win_set_option( s:nvim_border_win_id, 'number', v:false )
-
-  " when calculating where to display the content window, we need to account
-  " for the border
-  let opts.row += 1
-  let opts.height -= 2
-  let opts.col += 2
-  let opts.width -= 4
-
-  " create the content window
-  let buf_id = nvim_create_buf( v:false, v:true )
-  call nvim_buf_set_lines( buf_id, 0, -1, v:true, a:body )
-  call nvim_buf_set_option( buf_id, 'modifiable', v:false )
-  let s:popup_win_id = nvim_open_win( buf_id, v:false, opts )
-
-  " Apparently none of these work, when 'style' is 'minimal'
-  call nvim_win_set_option( s:popup_win_id, 'wrap', v:false )
-  call nvim_win_set_option( s:popup_win_id, 'cursorline', v:true )
-  call nvim_win_set_option( s:popup_win_id, 'signcolumn', 'no' )
-  call nvim_win_set_option( s:popup_win_id, 'relativenumber', v:false )
-  call nvim_win_set_option( s:popup_win_id, 'number', v:false )
-
-  " Move the cursor into the popup window, as this is the only way we can
-  " interract with the popup in neovim
-  noautocmd call win_gotoid( s:popup_win_id )
-
-  nnoremap <silent> <buffer> <Esc> <cmd>quit<CR>
-  call py3eval( "__import__( 'vimspector', "
-              \."            fromlist = [ 'variables' ] )."
-              \.'               variables.AddExpandMappings()' )
-
-  " Close the popup whenever we leave this window
-  augroup vimspector#internal#balloon#nvim_float
-    autocmd!
-    autocmd WinLeave <buffer>
-          \ :call vimspector#internal#balloon#Close()
-          \ | autocmd! vimspector#internal#balloon#nvim_float
-  augroup END
-
-  call vimspector#internal#balloon#ResizeTooltip()
-endfunction
-
-" }}}
-
-
 " Boilerplate {{{
 let &cpoptions=s:save_cpo
 unlet s:save_cpo

autoload/vimspector/internal/channel.vim

@@ -62,7 +62,7 @@ function! vimspector#internal#channel#StartDebugSession( config ) abort
           \              )
   endif
 
-  let l:addr = get( a:config, 'host', '127.0.0.1' ) . ':' . a:config[ 'port' ]
+  let l:addr = get( a:config, 'host', 'localhost' ) . ':' . a:config[ 'port' ]
 
   echo 'Connecting to ' . l:addr . '... (waiting fo up to 10 seconds)'
   let s:ch = ch_open( l:addr,
@@ -94,45 +94,34 @@ _vimspector_session.OnRequestTimeout( vim.eval( 'a:id' ) )
 EOF
 endfunction
 
-function! vimspector#internal#channel#StopDebugSession() abort
-
+function! s:KillJob() abort
   if exists( 's:job' )
-    " We started the job, so we need to kill it and wait to read all the data
-    " from the socket
-
     if job_status( s:job ) ==# 'run'
-      call job_stop( s:job, 'term' )
-    endif
-
-    while job_status( s:job ) ==# 'run'
       call job_stop( s:job, 'kill' )
-    endwhile
-
-    unlet s:job
-
-    if exists( 's:ch' ) && count( [ 'closed', 'fail' ], ch_status( s:ch ) ) == 0
-      " We're going to block on this channel reading, then manually call the
-      " close callback, so remove the automatic close callback to avoid tricky
-      " re-entrancy
-      call ch_setoptions( s:ch, { 'close_cb': '' } )
     endif
+    unlet s:job
+    sleep 500m
+  endif
+endfunction
 
-  elseif exists( 's:ch' ) &&
-          \ count( [ 'closed', 'fail' ], ch_status( s:ch ) ) == 0
-
+function! vimspector#internal#channel#StopDebugSession() abort
+  if exists( 's:ch' ) && ch_status( s:ch ) ==# 'open'
     " channel is open, close it and trigger the callback. The callback is _not_
     " triggered when manually calling ch_close. if we get here and the channel
     " is not open, then we there is a _OnClose callback waiting for us, so do
     " nothing.
     call ch_close( s:ch )
+    while ch_status( s:ch ) ==# 'buffered'
+      let data = ch_read( s:ch, {'timeout': 0} )
+      if data == ''
+        continue
+      endif
+      call s:_OnServerData( s:ch, data )
+    endwhile
+    call s:_OnClose( s:ch )
   endif
 
-  " block until we've read all data from the socket and handled it.
-  while count( [ 'open', 'buffered' ],  ch_status( s:ch ) ) == 1
-    let data = ch_read( s:ch, { 'timeout': 10 } )
-    call s:_OnServerData( s:ch, data )
-  endwhile
-  call s:_OnClose( s:ch )
+  call s:KillJob()
 endfunction
 
 function! vimspector#internal#channel#Reset() abort

autoload/vimspector/internal/neochannel.vim

@@ -66,7 +66,7 @@ function! vimspector#internal#neochannel#StartDebugSession( config ) abort
     endtry
   endif
 
-  let l:addr = get( a:config, 'host', '127.0.0.1' ) . ':' . a:config[ 'port' ]
+  let l:addr = get( a:config, 'host', 'localhost' ) . ':' . a:config[ 'port' ]
 
   let attempt = 1
   while attempt <= 10

autoload/vimspector/internal/neojob.vim

@@ -159,16 +159,15 @@ function! s:_OnCommandEvent( category, id, data, event ) abort
       call setbufvar( buffer, '&modified', 0 )
     endtry
 
-    " if the buffer is visible, scroll it, but don't allow autocommands to fire,
-    " as this may close the current window!
+    " if the buffer is visible, scroll it
     let w = bufwinnr( buffer )
     if w > 0
       let cw = winnr()
       try
-        noautocmd execute w . 'wincmd w'
-        noautocmd normal! Gz-
+        execute w . 'wincmd w'
+        normal! Gz-
       finally
-        noautocmd execute cw . 'wincmd w'
+        execute cw . 'wincmd w'
       endtry
     endif
   elseif a:event ==# 'exit'

autoload/vimspector/internal/neopopup.vim

@@ -80,56 +80,6 @@ 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

autoload/vimspector/internal/popup.vim

@@ -12,7 +12,6 @@
 " 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 {{{
@@ -33,113 +32,6 @@ 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

autoload/vimspector/internal/state.vim

@@ -34,7 +34,6 @@ function! vimspector#internal#state#Reset() abort
   catch /.*/
     echohl WarningMsg
     echom 'Exception while loading vimspector:' v:exception
-    echom 'From:' v:throwpoint
     echom 'Vimspector unavailable: Requires Vim compiled with Python 3.6'
     echohl None
     return v:false

docs/Gemfile

@@ -28,5 +28,3 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
 
-
-gem "webrick", "~> 1.7"