Merge remote-tracking branch 'origin/master' into vim-7.4.2170

1 files changed, 61 insertions, 0 deletions

diff --git a/test/functional/eval/match_functions_spec.lua b/test/functional/eval/match_functions_spec.lua
new file mode 100644
index 0000000000..3150d89f62
--- /dev/null
+++ b/test/functional/eval/match_functions_spec.lua
@@ -0,0 +1,61 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local clear = helpers.clear
+local funcs = helpers.funcs
+local command = helpers.command
+
+before_each(clear)
+
+describe('setmatches()', function()
+  it('correctly handles case when both group and pattern entries are numbers',
+  function()
+    command('hi def link 1 PreProc')
+    eq(0, funcs.setmatches({{group=1, pattern=2, id=3, priority=4}}))
+    eq({{
+      group='1',
+      pattern='2',
+      id=3,
+      priority=4,
+    }}, funcs.getmatches())
+    eq(0, funcs.setmatches({{group=1, pattern=2, id=3, priority=4, conceal=5}}))
+    eq({{
+      group='1',
+      pattern='2',
+      id=3,
+      priority=4,
+      conceal='5',
+    }}, funcs.getmatches())
+    eq(0, funcs.setmatches({{group=1, pos1={2}, pos2={6}, id=3, priority=4, conceal=5}}))
+    eq({{
+      group='1',
+      pos1={2},
+      pos2={6},
+      id=3,
+      priority=4,
+      conceal='5',
+    }}, funcs.getmatches())
+  end)
+
+  it('fails with -1 if highlight group is not defined', function()
+    eq(-1, funcs.setmatches({{group=1, pattern=2, id=3, priority=4}}))
+    eq({}, funcs.getmatches())
+    eq(-1, funcs.setmatches({{group=1, pos1={2}, pos2={6}, id=3, priority=4, conceal=5}}))
+    eq({}, funcs.getmatches())
+  end)
+end)
+
+describe('matchadd()', function()
+  it('correctly works when first two arguments and conceal are numbers at once',
+  function()
+    command('hi def link 1 PreProc')
+    eq(4, funcs.matchadd(1, 2, 3, 4, {conceal=5}))
+    eq({{
+      group='1',
+      pattern='2',
+      priority=3,
+      id=4,
+      conceal='5',
+    }}, funcs.getmatches())
+  end)
+end)