From 901b31f66cd8f6ec65699bf9ef010f62e1bd3435 Mon Sep 17 00:00:00 2001 From: Stephan Seitz Date: Fri, 15 Apr 2022 16:33:01 +0200 Subject: ci: don't skip swift anymore I think this was a nvim 0.6 issue --- scripts/check-queries.lua | 48 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) (limited to 'scripts/check-queries.lua') diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua index ff2cb6bb7..0fc7d7ea0 100755 --- a/scripts/check-queries.lua +++ b/scripts/check-queries.lua @@ -47,32 +47,28 @@ local function do_check() io_print "::group::Check parsers" for _, lang in pairs(parsers) do - -- NOTE: this is a temporary workaround to skip swift tests on ubuntu - -- stable and should be removed once neovim 0.7 is released. - if vim.fn.getenv "SKIP_SWIFT_CHECK" == vim.NIL or lang ~= "swift" then - timings[lang] = {} - for _, query_type in pairs(query_types) do - local before = vim.loop.hrtime() - local ok, query = pcall(queries.get_query, lang, query_type) - local after = vim.loop.hrtime() - local duration = after - before - table.insert(timings, { duration = duration, lang = lang, query_type = query_type }) - io_print("Checking " .. lang .. " " .. query_type .. string.format(" (%.02fms)", duration * 1e-6)) - if not ok then - vim.api.nvim_err_writeln(query) - last_error = query - else - if query then - for _, capture in ipairs(query.captures) do - local is_valid = ( - vim.startswith(capture, "_") -- Helpers. - or vim.tbl_contains(captures[query_type], capture) - ) - if not is_valid then - local error = string.format("(x) Invalid capture @%s in %s for %s.", capture, query_type, lang) - io_print(error) - last_error = error - end + timings[lang] = {} + for _, query_type in pairs(query_types) do + local before = vim.loop.hrtime() + local ok, query = pcall(queries.get_query, lang, query_type) + local after = vim.loop.hrtime() + local duration = after - before + table.insert(timings, { duration = duration, lang = lang, query_type = query_type }) + io_print("Checking " .. lang .. " " .. query_type .. string.format(" (%.02fms)", duration * 1e-6)) + if not ok then + vim.api.nvim_err_writeln(query) + last_error = query + else + if query then + for _, capture in ipairs(query.captures) do + local is_valid = ( + vim.startswith(capture, "_") -- Helpers. + or vim.tbl_contains(captures[query_type], capture) + ) + if not is_valid then + local error = string.format("(x) Invalid capture @%s in %s for %s.", capture, query_type, lang) + io_print(error) + last_error = error end end end -- cgit v1.2.3-70-g09d2