mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 10:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10745 from blueyed/vim-8.1.1461

Browse Source 
vim-patch:8.1.1461 / vim-patch:8.1.1462
This commit is contained in:
Daniel Hahler
2019-08-11 20:35:31 +02:00
committed by GitHub
parent 6b028ec5f2 ef1c100174
commit 48dc6344d6
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/testdir/test_debugger.vim
View File

@@ -52,16 +52,16 @@ func Test_Debugger()
let buf = RunVimInTerminal('-S Xtest.vim', {}) let buf = RunVimInTerminal('-S Xtest.vim', {})
" Start the Vim debugger " Start the Vim debugger
call RunDbgCmd(buf, ':debug echo Foo()') call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()'])
" Create a few stack frames by stepping through functions " Create a few stack frames by stepping through functions
call RunDbgCmd(buf, 'step') call RunDbgCmd(buf, 'step', ['line 1: let var1 = 1'])
call RunDbgCmd(buf, 'step') call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bar(var1) + 9'])
call RunDbgCmd(buf, 'step') call RunDbgCmd(buf, 'step', ['line 1: let var1 = 2 + a:var'])
call RunDbgCmd(buf, 'step') call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bazz(var1) + 4'])
call RunDbgCmd(buf, 'step') call RunDbgCmd(buf, 'step', ['line 1: try'])
call RunDbgCmd(buf, 'step') call RunDbgCmd(buf, 'step', ['line 2: let var1 = 3 + a:var'])
call RunDbgCmd(buf, 'step') call RunDbgCmd(buf, 'step', ['line 3: let var3 = "another var"'])
" check backtrace " check backtrace
call RunDbgCmd(buf, 'backtrace', [ call RunDbgCmd(buf, 'backtrace', [

2
src/nvim/testdir/test_environ.vim
View File

@@ -36,7 +36,7 @@ func Test_external_env()
call setenv('FOO', v:null) call setenv('FOO', v:null)
if has('win32') if has('win32')
let result = system('set | grep ^FOO=') let result = system('set | findstr "^FOO="')
else else
let result = system('env | grep ^FOO=') let result = system('env | grep ^FOO=')
endif endif

6
src/nvim/testdir/test_filetype.vim
View File

@@ -522,7 +522,11 @@ func CheckItems(checks)
catch catch
call assert_report('cannot edit "' . names[i] . '": ' . v:exception) call assert_report('cannot edit "' . names[i] . '": ' . v:exception)
endtry endtry
call assert_equal(ft, &filetype, 'with file name: ' . names[i]) if &filetype == '' && &readonly
" File exists but not able to edit it (permission denied)
else
call assert_equal(ft, &filetype, 'with file name: ' . names[i])
endif
bwipe! bwipe!
endfor endfor
endfor endfor

19
src/nvim/testdir/test_source.vim
View File

@@ -1,14 +1,5 @@
" Tests for the :source command. " Tests for the :source command.
func Test_source_sandbox()
new
call writefile(["Ohello\<Esc>"], 'Xsourcehello')
source! Xsourcehello | echo
call assert_equal('hello', getline(1))
call assert_fails('sandbox source! Xsourcehello', 'E48:')
bwipe!
endfunc
func Test_source_autocmd() func Test_source_autocmd()
call writefile([ call writefile([
\ 'let did_source = 1', \ 'let did_source = 1',
@@ -45,3 +36,13 @@ func Test_source_cmd()
au! SourcePre au! SourcePre
au! SourcePost au! SourcePost
endfunc endfunc
func Test_source_sandbox()
new
call writefile(["Ohello\<Esc>"], 'Xsourcehello')
source! Xsourcehello | echo
call assert_equal('hello', getline(1))
call assert_fails('sandbox source! Xsourcehello', 'E48:')
bwipe!
call delete('Xsourcehello')
endfunc