diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-18 00:47:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 00:47:30 +0200 |
| commit | 3059516e8ae04c6d2e1c41ac5f65896b4af2a196 (patch) | |
| tree | 38e6c7097389b22bf51a351f4dccc928d5d30aaa /src/nvim/testdir | |
| parent | aff64b3a52d3d897c5c88270c8e78ba3d02c52f7 (diff) | |
| parent | 6476d081be6fa0295cc0cdce4965c81303c71eff (diff) | |
| download | rneovim-3059516e8ae04c6d2e1c41ac5f65896b4af2a196.tar.gz rneovim-3059516e8ae04c6d2e1c41ac5f65896b4af2a196.tar.bz2 rneovim-3059516e8ae04c6d2e1c41ac5f65896b4af2a196.zip | |
Merge #9086 'vim-patch:8.1.0448'
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_diffmode.vim | 27 |
2 files changed, 33 insertions, 1 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index 44c01cfeff..99b2b940d7 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -67,7 +67,7 @@ lang mess C let v:testing = 1 " Support function: get the alloc ID by name. -function GetAllocId(name) +func GetAllocId(name) exe 'split ' . s:srcdir . '/alloc.h' let top = search('typedef enum') if top == 0 @@ -81,6 +81,11 @@ function GetAllocId(name) return lnum - top - 1 endfunc +func CanRunVimInTerminal() + " Nvim: always false, we use Lua screen-tests instead. + return 0 +endfunc + func RunTheTest(test) echo 'Executing ' . a:test diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index 90fd34d93e..afe289b262 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -588,3 +588,30 @@ func Test_diff_lastline() bwipe! bwipe! endfunc + +func Test_diff_with_cursorline() + if !CanRunVimInTerminal() + return + endif + + call writefile([ + \ 'hi CursorLine ctermbg=red ctermfg=white', + \ 'set cursorline', + \ 'call setline(1, ["foo","foo","foo","bar"])', + \ 'vnew', + \ 'call setline(1, ["bee","foo","foo","baz"])', + \ 'windo diffthis', + \ '2wincmd w', + \ ], 'Xtest_diff_cursorline') + let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {}) + + call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {}) + call term_sendkeys(buf, "j") + call VerifyScreenDump(buf, 'Test_diff_with_cursorline_02', {}) + call term_sendkeys(buf, "j") + call VerifyScreenDump(buf, 'Test_diff_with_cursorline_03', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('Xtest_diff_cursorline') +endfunc |