thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0721: conceal mode is not sufficiently tested

Browse Source 
Problem:    Conceal mode is not sufficiently tested.
Solution:   Add screendump tests.  Check all 'concealcursor' values.
This commit is contained in:
Bram Moolenaar
2019-01-11 15:54:45 +01:00
parent 5b69c22fd2
commit 429ab1761e
25 changed files with 521 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Make_all.mak
View File

@@ -33,6 +33,7 @@ NEW_TESTS = \
test_command_count \
test_comparators \
test_compiler \
test_conceal \
test_crypt \
test_cscope \
test_cursor_func \

1
src/testdir/Make_all.mak
View File

@@ -84,6 +84,7 @@ NEW_TESTS = test_arabic.res \
test_cmdline.res \
test_command_count.res \
test_comparators.res \
test_conceal.res \
test_crypt.res \
test_cscope.res \
test_curswant.res \

20
src/testdir/dumps/Test_conceal_two_windows_01.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1>h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|/+0&&|h|e|r|e| @69

20
src/testdir/dumps/Test_conceal_two_windows_02.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o>n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|/+0&&|h|e|r|e| @69

20
src/testdir/dumps/Test_conceal_two_windows_03.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=| @55

20
src/testdir/dumps/Test_conceal_two_windows_04.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| |||h|i|d@1|e|n>|| |t|h|r|e@1| @54
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=| @55

20
src/testdir/dumps/Test_conceal_two_windows_05.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=| @55

20
src/testdir/dumps/Test_conceal_two_windows_06c.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| |h|e+1&&|r+0&&|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|/+0&&|e> @72

20
src/testdir/dumps/Test_conceal_two_windows_06i.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| |h>e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62

20
src/testdir/dumps/Test_conceal_two_windows_06n.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1>h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|n| @54

20
src/testdir/dumps/Test_conceal_two_windows_06v.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9

20
src/testdir/dumps/Test_conceal_two_windows_07c.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| |h|e+1&&|r+0&&|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|/+0&&|e> @72

20
src/testdir/dumps/Test_conceal_two_windows_07i.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h>e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62

20
src/testdir/dumps/Test_conceal_two_windows_07n.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|i| @54

20
src/testdir/dumps/Test_conceal_two_windows_07v.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9

20
src/testdir/dumps/Test_conceal_two_windows_08c.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e+1&&|r+0&&|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|/+0&&|e> @72

20
src/testdir/dumps/Test_conceal_two_windows_08i.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| |h>e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62

20
src/testdir/dumps/Test_conceal_two_windows_08n.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|c| @54

20
src/testdir/dumps/Test_conceal_two_windows_08v.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9

20
src/testdir/dumps/Test_conceal_two_windows_09c.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| |h|e+1&&|r+0&&|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|/+0&&|e> @72

20
src/testdir/dumps/Test_conceal_two_windows_09i.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| |h>e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
|-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62

20
src/testdir/dumps/Test_conceal_two_windows_09n.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|v| @54

20
src/testdir/dumps/Test_conceal_two_windows_09v.dump Normal file
View File

@@ -0,0 +1,20 @@
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1|h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|S|e|c|o|n|d| |w|i|n|d|o|w| @61
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
|o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
|t|w|o| @1>h|e|r|e| @65
|t|h|r|e@1| @1|t|h|r|e@1| @62
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9

97
src/testdir/test_conceal.vim Normal file
View File

@@ -0,0 +1,97 @@
" Tests for 'conceal'.
" Also see test88.in (should be converted to a test function here).
if !has('conceal')
finish
endif
source screendump.vim
if !CanRunVimInTerminal()
finish
endif
func Test_conceal_two_windows()
call writefile([
\ 'let lines = ["one one one one one", "two |hidden| here", "three |hidden| three"]',
\ 'call setline(1, lines)',
\ 'syntax match test /|hidden|/ conceal',
\ 'set conceallevel=2',
\ 'set concealcursor=',
\ 'exe "normal /here\r"',
\ 'new',
\ 'call setline(1, lines)',
\ 'call setline(4, "Second window")',
\ 'syntax match test /|hidden|/ conceal',
\ 'set conceallevel=2',
\ 'set concealcursor=nc',
\ 'exe "normal /here\r"',
\ ], 'XTest_conceal')
" Check that cursor line is concealed
let buf = RunVimInTerminal('-S XTest_conceal', {})
call VerifyScreenDump(buf, 'Test_conceal_two_windows_01', {})
" Check that with concealed text vertical cursor movement is correct.
call term_sendkeys(buf, "k")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_02', {})
" Check that with cursor line is not concealed
call term_sendkeys(buf, "j")
call term_sendkeys(buf, ":set concealcursor=\r")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_03', {})
" Check that with cursor line is not concealed when moving cursor down
call term_sendkeys(buf, "j")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_04', {})
" Check that with cursor line is not concealed when switching windows
call term_sendkeys(buf, "\<C-W>\<C-W>")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_05', {})
" Check that with cursor line is only concealed in Normal mode
call term_sendkeys(buf, ":set concealcursor=n\r")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_06n', {})
call term_sendkeys(buf, "a")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_06i', {})
call term_sendkeys(buf, "\<Esc>/e")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_06c', {})
call term_sendkeys(buf, "\<Esc>v")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_06v', {})
call term_sendkeys(buf, "\<Esc>")
" Check that with cursor line is only concealed in Insert mode
call term_sendkeys(buf, ":set concealcursor=i\r")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_07n', {})
call term_sendkeys(buf, "a")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_07i', {})
call term_sendkeys(buf, "\<Esc>/e")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_07c', {})
call term_sendkeys(buf, "\<Esc>v")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_07v', {})
call term_sendkeys(buf, "\<Esc>")
" Check that with cursor line is only concealed in Command mode
call term_sendkeys(buf, ":set concealcursor=c\r")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_08n', {})
call term_sendkeys(buf, "a")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_08i', {})
call term_sendkeys(buf, "\<Esc>/e")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_08c', {})
call term_sendkeys(buf, "\<Esc>v")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_08v', {})
call term_sendkeys(buf, "\<Esc>")
" Check that with cursor line is only concealed in Visual mode
call term_sendkeys(buf, ":set concealcursor=v\r")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_09n', {})
call term_sendkeys(buf, "a")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_09i', {})
call term_sendkeys(buf, "\<Esc>/e")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_09c', {})
call term_sendkeys(buf, "\<Esc>v")
call VerifyScreenDump(buf, 'Test_conceal_two_windows_09v', {})
call term_sendkeys(buf, "\<Esc>")
" clean up
call StopVimInTerminal(buf)
call delete('XTest_conceal')
endfunc

2
src/version.c
View File

@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
721,
/**/
720,
/**/