From e18a5783080f7c94f408ec5f53dedffdb69789e1 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 20 Aug 2016 22:24:34 +0300
Subject: *: Move some dictionary functions to typval.h and use char*

Also fixes buffer reusage in setmatches() and complete().
---
 test/functional/eval/match_functions_spec.lua | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 test/functional/eval/match_functions_spec.lua

(limited to 'test/functional/eval/match_functions_spec.lua')

diff --git a/test/functional/eval/match_functions_spec.lua b/test/functional/eval/match_functions_spec.lua
new file mode 100644
index 0000000000..df91e41475
--- /dev/null
+++ b/test/functional/eval/match_functions_spec.lua
@@ -0,0 +1,39 @@
+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)
+end)
-- 
cgit 


From 54bd2e8b731376b29c150f909c6b50103bfbb91a Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 20 Aug 2016 22:25:57 +0300
Subject: eval: Make setmatches() return -1 in case of some failures

---
 test/functional/eval/match_functions_spec.lua | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'test/functional/eval/match_functions_spec.lua')

diff --git a/test/functional/eval/match_functions_spec.lua b/test/functional/eval/match_functions_spec.lua
index df91e41475..f6bad59c66 100644
--- a/test/functional/eval/match_functions_spec.lua
+++ b/test/functional/eval/match_functions_spec.lua
@@ -36,4 +36,11 @@ describe('setmatches()', function()
       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)
-- 
cgit 


From c8e63a8db84e9d9f7bd855085a87d93631504fc7 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 4 Sep 2016 02:25:24 +0300
Subject: eval: Move remaining get_tv_string* functions to eval/typval.c

---
 test/functional/eval/match_functions_spec.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'test/functional/eval/match_functions_spec.lua')

diff --git a/test/functional/eval/match_functions_spec.lua b/test/functional/eval/match_functions_spec.lua
index f6bad59c66..3150d89f62 100644
--- a/test/functional/eval/match_functions_spec.lua
+++ b/test/functional/eval/match_functions_spec.lua
@@ -44,3 +44,18 @@ describe('setmatches()', function()
     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)
-- 
cgit