Merge pull request #7 from vigoux/feature/highlight

Syntax highlighting

3 files changed, 23 insertions, 1 deletions

diff --git a/lua/nvim-treesitter.lua b/lua/nvim-treesitter.lua
index 8f2fa05ed..b053f39b0 100644
--- a/lua/nvim-treesitter.lua
+++ b/lua/nvim-treesitter.lua
@@ -3,6 +3,7 @@ local parsers = require'nvim-treesitter.parsers'
 local configs = require 'nvim-treesitter.configs'
 local install = require'nvim-treesitter.install'
 local locals = require'nvim-treesitter.locals'
+local highlight = require'nvim-treesitter.highlight'
 
 local M = {}
 
@@ -14,6 +15,8 @@ end
 -- this is the main interface through the plugin
 function M.setup(lang)
   if parsers.has_parser(lang) then
+    local autocmd = "autocmd NvimTreesitter FileType %s lua require'nvim-treesitter.highlight'.setup()"
+    api.nvim_command(string.format(autocmd, lang))
   end
 end
 
diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua
new file mode 100644
index 000000000..110954a6a
--- /dev/null
+++ b/lua/nvim-treesitter/highlight.lua
@@ -0,0 +1,19 @@
+local api = vim.api
+local queries = require'nvim-treesitter.query'
+local ts = vim.treesitter
+
+local M = {
+  highlighters={}
+}
+
+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
+
+  M.highlighters[buf] = ts.TSHighlighter.new(query, buf, ft)
+end
+
+return M
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index e9f671f93..277c29697 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