summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-10-02 11:58:55 +0200
committerStephan Seitz <stephan.seitz@fau.de>2022-10-02 09:29:34 -0400
commit8e763332b7bf7b3a426fd8707b7f5aa85823a5ac (patch)
treea64cd852087b85d6c21f15022692966b9924a8ce
parent28f54584243b9ef883ecf56a5921ec107cff2602 (diff)
fix(test): update tests to Nvim 0.8
-rw-r--r--lua/nvim-treesitter/highlight.lua4
-rw-r--r--tests/query/highlights_spec.lua6
2 files changed, 5 insertions, 5 deletions
diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua
index c1c20375..d30d1900 100644
--- a/lua/nvim-treesitter/highlight.lua
+++ b/lua/nvim-treesitter/highlight.lua
@@ -10,7 +10,7 @@ local M = {}
-- Note: Some highlight groups may not be applied upstream, some may be experimental
-- TODO(clason): deprecated and will be removed for Nvim 0.8
-local default_map = {
+M.default_map = {
["annotation"] = "TSAnnotation",
["attribute"] = "TSAttribute",
@@ -132,7 +132,7 @@ end
local function link_all_captures()
if link_captures then
- for capture, hlgroup in pairs(default_map) do
+ for capture, hlgroup in pairs(M.default_map) do
link_captures(capture, hlgroup)
end
end
diff --git a/tests/query/highlights_spec.lua b/tests/query/highlights_spec.lua
index c3c7d153..ec3a3913 100644
--- a/tests/query/highlights_spec.lua
+++ b/tests/query/highlights_spec.lua
@@ -1,4 +1,4 @@
-require "nvim-treesitter.highlight" -- yes, this is necessary to set the hlmap
+local ts_highlight = require "nvim-treesitter.highlight" -- yes, this is necessary to set the hlmap
local highlighter = require "vim.treesitter.highlighter"
local ts_utils = require "nvim-treesitter.ts_utils"
local parsers = require "nvim-treesitter.parsers"
@@ -70,9 +70,9 @@ local function check_assertions(file)
assert.is.number(col)
if hl and ts_utils.is_in_node_range(node, row, col) then
local c = query._query.captures[capture] -- name of the capture in the query
- if c ~= nil then
+ if c ~= nil and c ~= "spell" and c ~= "conceal" then
captures[c] = true
- local general_hl = query:_get_hl_from_capture(capture)
+ local general_hl = ts_highlight.default_map[c]
highlights[general_hl] = true
end
end