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

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

https://github.com/vim/vim/commit/b6fc72851c45a36a370f9516c68508e47b41c4c1

1 files changed, 24 insertions, 0 deletions

diff --git a/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua
index 4d81d85553..8e6756e550 100644
--- a/test/functional/ui/diff_spec.lua
+++ b/test/functional/ui/diff_spec.lua
@@ -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()