3 files changed, 32 insertions, 2 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 736ecc1ff7..82ef2f6263 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -223,23 +223,34 @@ local extension = {
   fb = "freebasic",
   fsi = "fsharp",
   fsx = "fsharp",
+  fusion = "fusion",
   gdmo = "gdmo",
   mo = "gdmo",
+  tres = "gdresource",
+  tscn = "gdresource",
+  gd = "gdscript",
   ged = "gedcom",
   gmi = "gemtext",
   gemini = "gemtext",
   gift = "gift",
+  glsl = "glsl",
   gpi = "gnuplot",
   gnuplot = "gnuplot",
   go = "go",
   gp = "gp",
   gs = "grads",
+  gql = "graphql",
+  graphql = "graphql",
+  graphqls = "graphql",
   gretl = "gretl",
   gradle = "groovy",
   groovy = "groovy",
   gsp = "gsp",
+  hack = "hack",
+  hackpartial = "hack",
   haml = "haml",
   hsm = "hamster",
+  hbs = "handlebars",
   ["hs-boot"] = "haskell",
   hsig = "haskell",
   hsc = "haskell",
@@ -251,8 +262,11 @@ local extension = {
   errsum = "hercules",
   ev = "hercules",
   vc = "hercules",
+  hcl = "hcl",
+  heex = "heex",
   hex = "hex",
   ["h32"] = "hex",
+  hjson = "hjson",
   hog = "hog",
   hws = "hollywood",
   htt = "httest",
@@ -310,6 +324,9 @@ local extension = {
   lte = "latte",
   ld = "ld",
   ldif = "ldif",
+  journal = "ledger",
+  ldg = "ledger",
+  ledger = "ledger",
   less = "less",
   lex = "lex",
   lxx = "lex",
@@ -393,6 +410,7 @@ local extension = {
   ncf = "ncf",
   nginx = "nginx",
   ninja = "ninja",
+  nix = "nix",
   nqc = "nqc",
   roff = "nroff",
   tmac = "nroff",
@@ -427,6 +445,7 @@ local extension = {
   pcmk = "pcmk",
   pdf = "pdf",
   plx = "perl",
+  prisma = "prisma",
   psgi = "perl",
   al = "perl",
   ctp = "php",
@@ -470,6 +489,7 @@ local extension = {
   ["ps1xml"] = "ps1xml",
   psf = "psf",
   psl = "psl",
+  pug = "pug",
   arr = "pyret",
   pxd = "pyrex",
   pyx = "pyrex",
@@ -477,6 +497,8 @@ local extension = {
   py = "python",
   pyi = "python",
   ptl = "python",
+  ql = "ql",
+  qll = "ql",
   rad = "radiance",
   mat = "radiance",
   ["pod6"] = "raku",
@@ -613,6 +635,7 @@ local extension = {
   mata = "stata",
   ado = "stata",
   stp = "stp",
+  sface = "surface",
   svelte = "svelte",
   svg = "svg",
   swift = "swift",
@@ -626,6 +649,7 @@ local extension = {
   itcl = "tcl",
   tk = "tcl",
   jacl = "tcl",
+  tl = "teal",
   tmpl = "template",
   ti = "terminfo",
   dtx = "tex",
@@ -637,7 +661,8 @@ local extension = {
   txi = "texinfo",
   texinfo = "texinfo",
   text = "text",
-  tf = "tf",
+  tfvars = "terraform",
+  tla = "tla",
   tli = "tli",
   toml = "toml",
   tpp = "tpp",
@@ -725,11 +750,13 @@ local extension = {
   yxx = "yacc",
   yml = "yaml",
   yaml = "yaml",
+  yang = "yang",
   ["z8a"] = "z8a",
   zig = "zig",
   zu = "zimbu",
   zut = "zimbutempl",
   zsh = "zsh",
+  vala = "vala",
   E = function() vim.fn["dist#ft#FTe"]() end,
   EU = function() vim.fn["dist#ft#EuphoriaCheck"]() end,
   EW = function() vim.fn["dist#ft#EuphoriaCheck"]() end,
@@ -800,6 +827,7 @@ local extension = {
   stm = function() vim.fn["dist#ft#FThtml"]() end,
   tcsh = function() vim.fn["dist#ft#SetFileTypeShell"]("tcsh") end,
   tex = function() vim.fn["dist#ft#FTtex"]() end,
+  tf = function() vim.fn["dist#ft#FTtf"]() end,
   w = function() vim.fn["dist#ft#FTprogress_cweb"]() end,
   xml = function() vim.fn["dist#ft#FTxml"]() end,
   y = function() vim.fn["dist#ft#FTy"]() end,
@@ -900,6 +928,7 @@ local filename = {
   [".gnashpluginrc"] = "gnash",
   gnashpluginrc = "gnash",
   gnashrc = "gnash",
+  ["go.work"] = "gowork",
   [".gprc"] = "gp",
   ["/.gnupg/gpg.conf"] = "gpg",
   ["/.gnupg/options"] = "gpg",
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 07f6418c0c..f9d539f028 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -11,6 +11,7 @@ local parsers = {}
 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)
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 6f347ff25f..8b106108df 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -14,7 +14,7 @@ function M.require_language(lang, path, silent)
     return true
   end
   if path == nil then
-    local fname = 'parser/' .. lang .. '.*'
+    local fname = 'parser/' .. vim.fn.fnameescape(lang) .. '.*'
     local paths = a.nvim_get_runtime_file(fname, false)
     if #paths == 0 then
       if silent then