mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0562: parsing of 'diffopt' is slightly wrong

Browse Source 
Problem:    Parsing of 'diffopt' is slightly wrong.
Solution:   Fix the parsing and add a test. (Jason Franklin, Christian
            Brabandt)

b6fc72851c
This commit is contained in:
Anatolii Sakhnik
2018-12-09 20:24:38 +02:00
parent f273e43cb8
commit 4e29810817
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/functional/ui/diff_spec.lua
View File

@@ -578,6 +578,30 @@ int main(int argc, char **argv)
|
]])
end)
it('indent-heuristic random order', function()
reread()
feed(':set diffopt=internal,filler,indent-heuristic,algorithm:patience<cr>')
feed(':<cr>')
screen:expect([[
{1: }^def finalize(value{3:│}{1: }def finalize(valu|
{1: } {3:│}{1: } |
{1: }{2:------------------}{3:│}{1: }{4: values.each do }|
{1: }{2:------------------}{3:│}{1: }{4: v.prepare }|
{1: }{2:------------------}{3:│}{1: }{4: end }|
{1: }{2:------------------}{3:│}{1: }{4: }|
{1: } values.each do |{3:│}{1: } values.each do |
{1: } v.finalize {3:│}{1: } v.finalize |
{1: } end {3:│}{1: } end |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
: |
]])
end)
end)
it('Diff the same file', function()