diff options
| author | David Bürgin <676c7473@gmail.com> | 2015-05-09 16:03:07 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-05-13 03:15:52 -0400 |
| commit | af4b0a76a757f44ea7fbfc8e1c863952adc6ac1e (patch) | |
| tree | c7f3c3bdb322360caae2abd65296d4586b3ed890 /test | |
| parent | 6a1d89462b6af3ed03a287f80105a7209c1ffac4 (diff) | |
| download | rneovim-af4b0a76a757f44ea7fbfc8e1c863952adc6ac1e.tar.gz rneovim-af4b0a76a757f44ea7fbfc8e1c863952adc6ac1e.tar.bz2 rneovim-af4b0a76a757f44ea7fbfc8e1c863952adc6ac1e.zip | |
vim-patch:7.4.587 #2622
Problem: Conceal does not work properly with 'linebreak'. (cs86661)
Solution: Save and restore boguscols. (Christian Brabandt)
https://github.com/vim/vim/commit/v7-4-587
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/legacy/listlbr_utf8_spec.lua | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/test/functional/legacy/listlbr_utf8_spec.lua b/test/functional/legacy/listlbr_utf8_spec.lua index 303596976f..15d12ac4af 100644 --- a/test/functional/legacy/listlbr_utf8_spec.lua +++ b/test/functional/legacy/listlbr_utf8_spec.lua @@ -16,9 +16,9 @@ describe('linebreak', function() put =\"\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP \" norm! zt set ts=4 sw=4 sts=4 linebreak sbr=+ wrap - fu! ScreenChar(width) + fu! ScreenChar(width, lines) let c='' - for j in range(1,4) + for j in range(1,a:lines) for i in range(1,a:width) let c.=nr2char(screenchar(j, i)) endfor @@ -35,12 +35,12 @@ describe('linebreak', function() let g:test ="Test 1: set linebreak + set list + fancy listchars" exe "set linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6" redraw! - let line=ScreenChar(winwidth(0)) + let line=ScreenChar(winwidth(0),4) call DoRecordScreen() let g:test ="Test 2: set nolinebreak list" set list nolinebreak redraw! - let line=ScreenChar(winwidth(0)) + let line=ScreenChar(winwidth(0),4) call DoRecordScreen() let g:test ="Test 3: set linebreak nolist" $put =\"\t*mask = nil;\" @@ -48,7 +48,18 @@ describe('linebreak', function() norm! zt set nolist linebreak redraw! - let line=ScreenChar(winwidth(0)) + let line=ScreenChar(winwidth(0),4) + call DoRecordScreen() + let g:test ="Test 4: set linebreak list listchars and concealing" + let c_defines=['#define ABCDE 1','#define ABCDEF 1','#define ABCDEFG 1','#define ABCDEFGH 1', '#define MSG_MODE_FILE 1','#define MSG_MODE_CONSOLE 2','#define MSG_MODE_FILE_AND_CONSOLE 3','#define MSG_MODE_FILE_THEN_CONSOLE 4'] + call append('$', c_defines) + vert resize 40 + $-7 + norm! zt + set list linebreak listchars=tab:>- cole=1 + syn match Conceal conceal cchar=>'AB\|MSG_MODE' + redraw! + let line=ScreenChar(winwidth(0),7) call DoRecordScreen() ]]) @@ -74,6 +85,23 @@ describe('linebreak', function() *mask = nil; ~ ~ - ~ ]]) + ~ + #define ABCDE 1 + #define ABCDEF 1 + #define ABCDEFG 1 + #define ABCDEFGH 1 + #define MSG_MODE_FILE 1 + #define MSG_MODE_CONSOLE 2 + #define MSG_MODE_FILE_AND_CONSOLE 3 + #define MSG_MODE_FILE_THEN_CONSOLE 4 + + Test 4: set linebreak list listchars and concealing + #define ABCDE>-->---1 + #define >CDEF>-->---1 + #define >CDEFG>->---1 + #define >CDEFGH>----1 + #define >_FILE>--------->--->---1 + #define >_CONSOLE>---------->---2 + #define >_FILE_AND_CONSOLE>---------3 ]]) end) end) |