1 files changed, 28 insertions, 23 deletions
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 07f6418c0c..70f2c425ed 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -1,31 +1,32 @@
 local a = vim.api
-local query = require'vim.treesitter.query'
-local language = require'vim.treesitter.language'
-local LanguageTree = require'vim.treesitter.languagetree'
+local query = require('vim.treesitter.query')
+local language = require('vim.treesitter.language')
+local LanguageTree = require('vim.treesitter.languagetree')
 
 -- TODO(bfredl): currently we retain parsers for the lifetime of the buffer.
 -- Consider use weak references to release parser if all plugins are done with
 -- it.
 local parsers = {}
 
-local M = vim.tbl_extend("error", query, language)
+local M = vim.tbl_extend('error', query, language)
 
 M.language_version = vim._ts_get_language_version()
+M.minimum_language_version = vim._ts_get_minimum_language_version()
 
 setmetatable(M, {
-  __index = function (t, k)
-      if k == "highlighter" then
-        t[k] = require'vim.treesitter.highlighter'
-        return t[k]
-      elseif k == "language" then
-        t[k] = require"vim.treesitter.language"
-        return t[k]
-      elseif k == "query" then
-        t[k] = require"vim.treesitter.query"
-        return t[k]
-      end
-   end
- })
+  __index = function(t, k)
+    if k == 'highlighter' then
+      t[k] = require('vim.treesitter.highlighter')
+      return t[k]
+    elseif k == 'language' then
+      t[k] = require('vim.treesitter.language')
+      return t[k]
+    elseif k == 'query' then
+      t[k] = require('vim.treesitter.query')
+      return t[k]
+    end
+  end,
+})
 
 --- Creates a new parser.
 ---
@@ -62,7 +63,11 @@ function M._create_parser(bufnr, lang, opts)
     self:_on_reload(...)
   end
 
-  a.nvim_buf_attach(self:source(), false, {on_bytes=bytes_cb, on_detach=detach_cb, on_reload=reload_cb, preview=true})
+  a.nvim_buf_attach(
+    self:source(),
+    false,
+    { on_bytes = bytes_cb, on_detach = detach_cb, on_reload = reload_cb, preview = true }
+  )
 
   self:parse()
 
@@ -86,10 +91,10 @@ function M.get_parser(bufnr, lang, opts)
     bufnr = a.nvim_get_current_buf()
   end
   if lang == nil then
-    lang = a.nvim_buf_get_option(bufnr, "filetype")
+    lang = a.nvim_buf_get_option(bufnr, 'filetype')
   end
 
-  if parsers[bufnr] == nil then
+  if parsers[bufnr] == nil or parsers[bufnr]:lang() ~= lang then
     parsers[bufnr] = M._create_parser(bufnr, lang, opts)
   end
 
@@ -104,10 +109,10 @@ end
 ---@param lang The language of this string
 ---@param opts Options to pass to the created language tree
 function M.get_string_parser(str, lang, opts)
-  vim.validate {
+  vim.validate({
     str = { str, 'string' },
-    lang = { lang, 'string' }
-  }
+    lang = { lang, 'string' },
+  })
   language.require_language(lang)
 
   return LanguageTree.new(str, lang, opts)