diff options
| author | Daniel Hahler <git@thequod.de> | 2019-09-15 15:55:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 15:55:50 +0200 |
| commit | b9d035a39cfcd61eab2633f55e6064460f557c69 (patch) | |
| tree | 3e3abef7d839e2a53ef113f9ae0cfd3a5e335b1a | |
| parent | 86e819d492faa2494ffe0e86f37c49eb4c0f2e56 (diff) | |
| parent | 36a167015145b46bc043daac2d06c3dc5f8b8dbb (diff) | |
| download | rneovim-b9d035a39cfcd61eab2633f55e6064460f557c69.tar.gz rneovim-b9d035a39cfcd61eab2633f55e6064460f557c69.tar.bz2 rneovim-b9d035a39cfcd61eab2633f55e6064460f557c69.zip | |
Merge pull request #11026 from janlazo/vim-8.1.0220
vim-patch:8.1.0220
| -rw-r--r-- | src/nvim/testdir/setup.vim | 18 | ||||
| -rw-r--r-- | src/nvim/testdir/test_ruby.vim | 8 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index f79fb9e518..ea28f328ae 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -31,12 +31,6 @@ let &packpath = &rtp " Avoid storing shell history. let $HISTFILE = "" -" Make sure $HOME does not get read or written. -let $HOME = expand(getcwd() . '/XfakeHOME') -if !isdirectory($HOME) - call mkdir($HOME) -endif - " Use default shell on Windows to avoid segfault, caused by TUI if has('win32') let $SHELL = '' @@ -45,3 +39,15 @@ if has('win32') set shellcmdflag=/s/c shellxquote=\" shellredir=>%s\ 2>&1 let &shellpipe = &shellredir endif + +" Detect user modules for language providers +let $PYTHONUSERBASE = $HOME . '/.local' +if executable('gem') + let $GEM_PATH = system('gem env gempath') +endif + +" Make sure $HOME does not get read or written. +let $HOME = expand(getcwd() . '/XfakeHOME') +if !isdirectory($HOME) + call mkdir($HOME) +endif diff --git a/src/nvim/testdir/test_ruby.vim b/src/nvim/testdir/test_ruby.vim index ef1a2d25b7..64199570a9 100644 --- a/src/nvim/testdir/test_ruby.vim +++ b/src/nvim/testdir/test_ruby.vim @@ -34,6 +34,14 @@ func Test_ruby_evaluate_dict() call assert_equal(['{"a"=>"foo", "b"=>123}'], split(l:out, "\n")) endfunc +func Test_ruby_evaluate_special_var() + let l = [v:true, v:false, v:null] + redir => l:out + ruby d = Vim.evaluate("l"); print d + redir END + call assert_equal(['[true, false, nil]'], split(l:out, "\n")) +endfunc + func Test_rubydo() throw 'skipped: TODO: ' " Check deleting lines does not trigger ml_get error. |