diff options
Diffstat (limited to 'test/functional/treesitter/query_spec.lua')
| -rw-r--r-- | test/functional/treesitter/query_spec.lua | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/test/functional/treesitter/query_spec.lua b/test/functional/treesitter/query_spec.lua index d8338c1335..c97619c913 100644 --- a/test/functional/treesitter/query_spec.lua +++ b/test/functional/treesitter/query_spec.lua @@ -82,17 +82,17 @@ void ui_refresh(void) local long_query = test_query:rep(100) ---@return number local function q(_n) - return exec_lua(function(query, n0) + return exec_lua(function() local before = vim.api.nvim__stats().ts_query_parse_count collectgarbage('stop') - for _ = 1, n0, 1 do - vim.treesitter.query.parse('c', query, n0) + for _ = 1, _n, 1 do + vim.treesitter.query.parse('c', long_query, _n) end collectgarbage('restart') collectgarbage('collect') local after = vim.api.nvim__stats().ts_query_parse_count return after - before - end, long_query, _n) + end) end eq(1, q(1)) @@ -103,8 +103,8 @@ void ui_refresh(void) it('supports query and iter by capture (iter_captures)', function() insert(test_text) - local res = exec_lua(function(test_query0) - local cquery = vim.treesitter.query.parse('c', test_query0) + local res = exec_lua(function() + local cquery = vim.treesitter.query.parse('c', test_query) local parser = vim.treesitter.get_parser(0, 'c') local tree = parser:parse()[1] local res = {} @@ -113,7 +113,7 @@ void ui_refresh(void) table.insert(res, { '@' .. cquery.captures[cid], node:type(), node:range() }) end return res - end, test_query) + end) eq({ { '@type', 'primitive_type', 8, 2, 8, 6 }, -- bool @@ -133,8 +133,8 @@ void ui_refresh(void) insert(test_text) ---@type table - local res = exec_lua(function(test_query0) - local cquery = vim.treesitter.query.parse('c', test_query0) + local res = exec_lua(function() + local cquery = vim.treesitter.query.parse('c', test_query) local parser = vim.treesitter.get_parser(0, 'c') local tree = parser:parse()[1] local res = {} @@ -149,7 +149,7 @@ void ui_refresh(void) table.insert(res, { pattern, mrepr }) end return res - end, test_query) + end) eq({ { 3, { { '@type', 'primitive_type', 8, 2, 8, 6 } } }, @@ -449,7 +449,7 @@ void ui_refresh(void) local custom_query = '((identifier) @main (#is-main? @main))' do - local res = exec_lua(function(custom_query0) + local res = exec_lua(function() local query = vim.treesitter.query local function is_main(match, _pattern, bufnr, predicate) @@ -466,7 +466,7 @@ void ui_refresh(void) query.add_predicate('is-main?', is_main) - local query0 = query.parse('c', custom_query0) + local query0 = query.parse('c', custom_query) local nodes = {} for _, node in query0:iter_captures(parser:parse()[1]:root(), 0) do @@ -474,14 +474,14 @@ void ui_refresh(void) end return nodes - end, custom_query) + end) eq({ { 0, 4, 0, 8 } }, res) end -- Once with the old API. Remove this whole 'do' block in 0.12 do - local res = exec_lua(function(custom_query0) + local res = exec_lua(function() local query = vim.treesitter.query local function is_main(match, _pattern, bufnr, predicate) @@ -494,7 +494,7 @@ void ui_refresh(void) query.add_predicate('is-main?', is_main, { all = false, force = true }) - local query0 = query.parse('c', custom_query0) + local query0 = query.parse('c', custom_query) local nodes = {} for _, node in query0:iter_captures(parser:parse()[1]:root(), 0) do @@ -502,7 +502,7 @@ void ui_refresh(void) end return nodes - end, custom_query) + end) -- Remove this 'do' block in 0.12 eq(0, fn.has('nvim-0.12')) @@ -538,15 +538,15 @@ void ui_refresh(void) local function test(input, query) api.nvim_buf_set_lines(0, 0, -1, true, vim.split(dedent(input), '\n')) - return exec_lua(function(query_str) + return exec_lua(function() local parser = vim.treesitter.get_parser(0, 'lua') - local query0 = vim.treesitter.query.parse('lua', query_str) + local query0 = vim.treesitter.query.parse('lua', query) local nodes = {} for _, node in query0:iter_captures(parser:parse()[1]:root(), 0) do nodes[#nodes + 1] = { node:range() } end return nodes - end, query) + end) end eq( @@ -641,8 +641,8 @@ void ui_refresh(void) eq(0, fn.has('nvim-0.12')) insert(test_text) - local res = exec_lua(function(test_query0) - local cquery = vim.treesitter.query.parse('c', test_query0) + local res = exec_lua(function() + local cquery = vim.treesitter.query.parse('c', test_query) local parser = vim.treesitter.get_parser(0, 'c') local tree = parser:parse()[1] local res = {} @@ -654,7 +654,7 @@ void ui_refresh(void) table.insert(res, { pattern, mrepr }) end return res - end, test_query) + end) eq({ { 3, { { '@type', 'primitive_type', 8, 2, 8, 6 } } }, @@ -686,19 +686,19 @@ void ui_refresh(void) int bar = 13; ]] - local ret = exec_lua(function(str) - local parser = vim.treesitter.get_string_parser(str, 'c') + local ret = exec_lua(function() + local parser = vim.treesitter.get_string_parser(txt, 'c') local nodes = {} local query = vim.treesitter.query.parse('c', '((identifier) @foo)') - local first_child = parser:parse()[1]:root():child(1) + local first_child = assert(parser:parse()[1]:root():child(1)) - for _, node in query:iter_captures(first_child, str) do + for _, node in query:iter_captures(first_child, txt) do table.insert(nodes, { node:range() }) end return nodes - end, txt) + end) eq({ { 1, 10, 1, 13 } }, ret) end) @@ -801,8 +801,8 @@ void ui_refresh(void) (#eq? @function.name "foo")) ]] - local result = exec_lua(function(query_str) - local query0 = vim.treesitter.query.parse('c', query_str) + local result = exec_lua(function() + local query0 = vim.treesitter.query.parse('c', query) local match_preds = query0.match_preds local called = 0 function query0:match_preds(...) @@ -816,7 +816,7 @@ void ui_refresh(void) captures[#captures + 1] = id end return { called, captures } - end, query) + end) eq({ 2, { 1, 1, 2, 2 } }, result) end) |