mirror of
https://github.com/neovim/neovim.git
synced 2024-12-20 03:05:11 -07:00
Adjust tests for the new preview window
... that does not have that superflous last line. Also, remove some indeterminism for the freebsd64 tests. Partially, those were suggested by the tests themselves, while successfull. Some of them were added after some testing because the lookaround test would fail on freebsd64 only.
This commit is contained in:
KillTheMule
parent
d8bb1dabb6
commit
be20b20cf3
@ -725,7 +725,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] }|
|
||||
|2| two lines |
|
||||
|4| two lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -767,7 +767,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] [+] }|
|
||||
|2| two lines |
|
||||
|4| two lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -788,7 +788,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] [+] }|
|
||||
|2| o lines |
|
||||
|4| o lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -807,7 +807,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] [+] }|
|
||||
|2| {12:x}o lines |
|
||||
|4| {12:x}o lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -826,7 +826,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] [+] }|
|
||||
|2| o lines |
|
||||
|4| o lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -848,7 +848,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] [+] }|
|
||||
|2| {12:XX}o lines |
|
||||
|4| {12:XX}o lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -915,7 +915,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] [+] }|
|
||||
|2| {9:tw}o lines |
|
||||
|4| {9:tw}o lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -937,7 +937,7 @@ describe(":substitute, inccommand=split", function()
|
||||
two lines |
|
||||
{11:[No Name] [+] }|
|
||||
|1| {12:123} {12:123} {12:123} |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1113,7 +1113,7 @@ describe(":substitute, inccommand=split", function()
|
||||
{11:[No Name] [+] }|
|
||||
|1| Inc subs{12:X}itution on |
|
||||
|2| {12:X}wo lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1221,6 +1221,7 @@ describe("inccommand=nosplit", function()
|
||||
feed("<Esc>")
|
||||
command("set icm=nosplit")
|
||||
feed(":%s/tw/OKOK")
|
||||
wait()
|
||||
screen:expect([[
|
||||
Inc substitution on |
|
||||
{12:OKOK}o lines |
|
||||
@ -1641,7 +1642,7 @@ describe("'inccommand' split windows", function()
|
||||
{15:~ }{10:|}{15:~ }|
|
||||
{10:[No Name] [+] [No Name] [+] }|
|
||||
|2| two lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1680,7 +1681,7 @@ describe("'inccommand' split windows", function()
|
||||
{15:~ }|
|
||||
{10:[No Name] [+] }|
|
||||
|2| two lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1730,7 +1731,7 @@ describe("'inccommand' split windows", function()
|
||||
{15:~ }|
|
||||
{11:[No Name] [+] }|
|
||||
|2| two lines |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1790,7 +1791,7 @@ describe(":substitute", function()
|
||||
{15:~ }|
|
||||
{11:[No Name] [+] }|
|
||||
|1| 1 {12:MMM} Y Z |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1811,7 +1812,7 @@ describe(":substitute", function()
|
||||
|1| 1 {12:MMM} |
|
||||
|2|{12: K} |
|
||||
|3|{12: LLL} Y Z |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1878,7 +1879,7 @@ describe(":substitute", function()
|
||||
{11:[No Name] [+] }|
|
||||
|1| {12:XLK} bdc e{12:XLK}e {12:XLK} fgl lzi{12:X}|
|
||||
{12:LK} r |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -1929,7 +1930,7 @@ describe(":substitute", function()
|
||||
|2| {12:OKO} B C |
|
||||
|3| 4 5 6 |
|
||||
|4| {12:OKO} Y Z |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{10:[Preview] }|
|
||||
@ -1975,7 +1976,7 @@ describe(":substitute", function()
|
||||
{11:[No Name] [+] }|
|
||||
|1| T {12:123123} {12:22}T TTT {12:090804090}|
|
||||
{12:804} |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -2029,7 +2030,7 @@ describe(":substitute", function()
|
||||
|3| afa Q |
|
||||
|4| adf la;lkd R |
|
||||
|5| alx |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -2046,7 +2047,7 @@ describe(":substitute", function()
|
||||
{15:~ }|
|
||||
{11:[No Name] [+] }|
|
||||
|3| afa {12:KKK}adf la;lkd {12:KKK}alx |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -2100,7 +2101,7 @@ describe(":substitute", function()
|
||||
|1| {12:X¥¥} PEPPERS |
|
||||
|2| {12:X¥¥} |
|
||||
|3| a{12:X¥¥}¥KOL |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -2122,7 +2123,7 @@ describe(":substitute", function()
|
||||
|4|{12: a££ ¥} |
|
||||
|5| a{12:X¥¥} |
|
||||
|6|{12: a££ ¥}¥KOL |
|
||||
|
|
||||
{15:~ }|
|
||||
{10:[Preview] }|
|
||||
:%s/£.*ѫ/X¥¥\ra££ ¥^ |
|
||||
]])
|
||||
@ -2304,7 +2305,7 @@ describe(":substitute", function()
|
||||
{15:~ }|
|
||||
{11:[No Name] [+] }|
|
||||
|1| some{12:one} |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -2313,8 +2314,9 @@ describe(":substitute", function()
|
||||
{10:[Preview] }|
|
||||
:%s/\(some\)\@<=thing/one/^ |
|
||||
]])
|
||||
feed("<C-c>")
|
||||
|
||||
feed("<C-c>")
|
||||
wait()
|
||||
feed([[:%s/\(some\)\@<lt>!thing/one/]])
|
||||
screen:expect([[
|
||||
something |
|
||||
@ -2324,7 +2326,7 @@ describe(":substitute", function()
|
||||
{15:~ }|
|
||||
{11:[No Name] [+] }|
|
||||
|2| every{12:one} |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -2333,8 +2335,9 @@ describe(":substitute", function()
|
||||
{10:[Preview] }|
|
||||
:%s/\(some\)\@<!thing/one/^ |
|
||||
]])
|
||||
feed([[<C-c>]])
|
||||
|
||||
feed([[<C-c>]])
|
||||
wait()
|
||||
feed([[:%s/some\(thing\)\@=/every/]])
|
||||
screen:expect([[
|
||||
{12:every}thing |
|
||||
@ -2344,7 +2347,7 @@ describe(":substitute", function()
|
||||
{15:~ }|
|
||||
{11:[No Name] [+] }|
|
||||
|1| {12:every}thing |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
@ -2353,8 +2356,9 @@ describe(":substitute", function()
|
||||
{10:[Preview] }|
|
||||
:%s/some\(thing\)\@=/every/^ |
|
||||
]])
|
||||
feed([[<C-c>]])
|
||||
|
||||
feed([[<C-c>]])
|
||||
wait()
|
||||
feed([[:%s/some\(thing\)\@!/every/]])
|
||||
screen:expect([[
|
||||
everything |
|
||||
@ -2364,7 +2368,7 @@ describe(":substitute", function()
|
||||
{15:~ }|
|
||||
{11:[No Name] [+] }|
|
||||
|3| {12:every}one |
|
||||
|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
{15:~ }|
|
||||
|
||||
Loading…
Reference in New Issue
Block a user