Merge pull request #90 from kyazdani42/fix/parser-names-as-filetypes

refacto/fix: filetype / parser name distinction

1 files changed, 6 insertions, 5 deletions

diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua
index 0086fcb0..71760146 100644
--- a/lua/nvim-treesitter/highlight.lua
+++ b/lua/nvim-treesitter/highlight.lua
@@ -2,6 +2,7 @@ local api = vim.api
 local ts = vim.treesitter
 
 local queries = require'nvim-treesitter.query'
+local parsers = require'nvim-treesitter.parsers'
 
 local M = {
   highlighters = {}
@@ -50,14 +51,14 @@ hlmap["type.builtin"] = "Type"
 hlmap["structure"] = "Structure"
 hlmap["include"] = "Include"
 
-function M.attach(bufnr, ft)
-  local buf = bufnr or api.nvim_get_current_buf()
-  local ft = ft or api.nvim_buf_get_option(buf, 'ft')
+function M.attach(bufnr, lang)
+  local bufnr = bufnr or api.nvim_get_current_buf()
+  local lang = lang or parsers.ft_to_lang(api.nvim_buf_get_option(bufnr, 'ft'))
 
-  local query = queries.get_query(ft, "highlights")
+  local query = queries.get_query(lang, "highlights")
   if not query then return end
 
-  M.highlighters[buf] = ts.TSHighlighter.new(query, buf, ft)
+  M.highlighters[bufnr] = ts.TSHighlighter.new(query, bufnr, lang)
 end
 
 function M.detach(bufnr)