diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-12-07 18:36:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 18:36:58 +0100 |
| commit | ddf48193e6f86163a0ecae76bc4b802b07135acb (patch) | |
| tree | e6d4b38538430fa7bd889e738ed54f463bc555c2 /test/functional/ui/diff_spec.lua | |
| parent | a2db756206512eca4990abad8d9dad890ade5c0c (diff) | |
| parent | b326bf5f419b345d50407be4fb43b937510112a4 (diff) | |
| download | rneovim-ddf48193e6f86163a0ecae76bc4b802b07135acb.tar.gz rneovim-ddf48193e6f86163a0ecae76bc4b802b07135acb.tar.bz2 rneovim-ddf48193e6f86163a0ecae76bc4b802b07135acb.zip | |
Merge pull request #16559 from zeertzjq/filler-end-row
fix(screen): do not draw filler lines post eof if already at last row
Diffstat (limited to 'test/functional/ui/diff_spec.lua')
| -rw-r--r-- | test/functional/ui/diff_spec.lua | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua index 13949b0756..bd2692d19a 100644 --- a/test/functional/ui/diff_spec.lua +++ b/test/functional/ui/diff_spec.lua @@ -186,6 +186,19 @@ describe('Diff mode screen', function() {7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }| :set diffopt+=internal | ]]) + + screen:try_resize(40, 9) + screen:expect([[ + {1:+ }{5:^+-- 4 lines: 1···}{3:│}{1:+ }{5:+-- 4 lines: 1··}| + {1: }5 {3:│}{1: }5 | + {1: }6 {3:│}{1: }6 | + {1: }7 {3:│}{1: }7 | + {1: }8 {3:│}{1: }8 | + {1: }9 {3:│}{1: }9 | + {1: }10 {3:│}{1: }10 | + {7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }| + | + ]]) end) it('Add a line at the end of file 1', function() @@ -232,6 +245,19 @@ describe('Diff mode screen', function() {7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }| :set diffopt+=internal | ]]) + + screen:try_resize(40, 9) + screen:expect([[ + {1:+ }{5:^+-- 4 lines: 1···}{3:│}{1:+ }{5:+-- 4 lines: 1··}| + {1: }5 {3:│}{1: }5 | + {1: }6 {3:│}{1: }6 | + {1: }7 {3:│}{1: }7 | + {1: }8 {3:│}{1: }8 | + {1: }9 {3:│}{1: }9 | + {1: }10 {3:│}{1: }10 | + {7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }| + | + ]]) end) it('Add a line in the middle of file 2, remove on at the end of file 1', function() |