diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-10-08 09:35:23 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-10-08 09:35:23 +0800 |
| commit | 76606b6bc587fddcf990cf40a39521750734a80d (patch) | |
| tree | 2810779733954dccec0bae739768b8d4e4186d4c /test/functional | |
| parent | f2b9ccec106b6c4619cc762ea77546810f1cbfd4 (diff) | |
| parent | 032b088c848585e60e8dc1a210f240bad6bb3387 (diff) | |
| download | rneovim-76606b6bc587fddcf990cf40a39521750734a80d.tar.gz rneovim-76606b6bc587fddcf990cf40a39521750734a80d.tar.bz2 rneovim-76606b6bc587fddcf990cf40a39521750734a80d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/legacy/003_cindent_spec.lua | 34 | ||||
| -rw-r--r-- | test/functional/ui/highlight_spec.lua | 6 |
2 files changed, 37 insertions, 3 deletions
diff --git a/test/functional/legacy/003_cindent_spec.lua b/test/functional/legacy/003_cindent_spec.lua index 202baadd4c..58e87354fb 100644 --- a/test/functional/legacy/003_cindent_spec.lua +++ b/test/functional/legacy/003_cindent_spec.lua @@ -4718,4 +4718,38 @@ describe('cindent', function() JSEND ]=]) end) + + it('line continuations in macros / vim-patch 8.0.0148', function() + insert_([=[ + /* start of define */ + { + } + #define AAA \ + BBB\ + CCC + + #define CNT \ + 1 + \ + 2 + \ + 4 + /* end of define */]=]) + + feed_command('set cino&') + feed_command('/start of define') + feed('=/end of define<cr>') + + expect([=[ + /* start of define */ + { + } + #define AAA \ + BBB\ + CCC + + #define CNT \ + 1 + \ + 2 + \ + 4 + /* end of define */]=]) + end) end) diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua index d1357ea525..077b0ec14c 100644 --- a/test/functional/ui/highlight_spec.lua +++ b/test/functional/ui/highlight_spec.lua @@ -518,7 +518,7 @@ describe("'listchars' highlight", function() ]]) feed_command('set cursorline') screen:expect([[ - {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{4:>}| + {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{3:>}| {5:>-------.}abcd{5:*}{4:¬} | {4:¬} | {4:~ }| @@ -526,7 +526,7 @@ describe("'listchars' highlight", function() ]]) feed('$') screen:expect([[ - {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1: }| + {3:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1: }| {4:<} | {4:<} | {4:~ }| @@ -607,7 +607,7 @@ describe("'listchars' highlight", function() feed('<esc>$') screen:expect([[ {4:<} | - {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1: }| + {3:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1: }| {4:<} | {4:~ }| | |