2 files changed, 18 insertions, 1 deletions
diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua
new file mode 100644
index 00000000..4acb202b
--- /dev/null
+++ b/lua/nvim-treesitter/highlight.lua
@@ -0,0 +1,17 @@
+local api = vim.api
+local queries = require'nvim-treesitter.query'
+local ts = vim.treesitter
+
+local M = {}
+
+function M.setup(bufnr, ft)
+  local buf = bufnr or api.nvim_get_current_buf()
+  local ft = ft or api.nvim_buf_get_option(buf, 'ft')
+
+  local query = queries.get_query(ft, "highlights")
+  if not query then return end
+
+  ts.TSHighlighter.new(query, buf, ft)
+end
+
+return M
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index e9f671f9..277c2969 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -62,7 +62,7 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
       local preds = query.info.patterns[pattern]
       if preds then
         for _, pred in pairs(preds) do
-          if pred[1] == "set!" and pred[2] ~= nil then
+          if pred[1] == "set!" and type(pred[2]) == "string" then
             insert_to_path(prepared_match, split(pred[2]), pred[3])
           end
         end