2 files changed, 8 insertions, 4 deletions
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index d4a23d65a..e58e5fc58 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -20,7 +20,7 @@ function M.collect_locals(bufnr)
   if not ft then return end
 
   local query = queries.get_query(ft, 'locals')
-  local parser = parsers.get_parser(bufnr)
+  local parser = parsers.get_parser(bufnr, ft)
 
   if not parser then return end
 
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c85177733..e046ca45c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -8,13 +8,17 @@ function M.has_parser(lang)
   return #api.nvim_get_runtime_file('parser/' .. lang .. '.*', false) > 0
 end
 
-function M.get_parser(bufnr)
+function M.get_parser(bufnr, lang)
   if M.has_parser() then
     local buf = bufnr or api.nvim_get_current_buf()
+    local lang = lang or api.nvim_buf_get_option(buf, 'ft')
     if not M[buf] then
-      M[buf] = ts.get_parser(buf)
+      M[buf] = {}
     end
-    return M[buf]
+    if not M[buf][lang] then
+      M[buf][lang] = ts.get_parser(buf, lang)
+    end
+    return M[buf][lang]
   end
 end