benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-15 18:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(parser): register common short-hand as filetypes

Browse source 
Problem: Cannot use short-hands for @injection.language (e.g., `py` for
Python).

Solution: Register common short-hand as filetypes for some languages.

List taken from https://github.com/helix-editor/helix/blob/master/languages.toml

Also remove deprecation custom filetype->parser mapping.
This commit is contained in:
Christian Clason 2024-07-09 16:57:08 +02:00
parent c1ad655b6a
commit a64ce9f989
1 changed files with 14 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lua/nvim-treesitter/parsers.lua
View file

@ -1,36 +1,11 @@
local api = vim.api local api = vim.api
local ts = vim.treesitter local ts = vim.treesitter
local new_lang_api = ts.language.register ~= nil
local filetype_to_parsername = {}
if new_lang_api then
filetype_to_parsername = setmetatable({}, {
__newindex = function(_, k, v)
require("nvim-treesitter.utils").notify(
"filetype_to_parsername is deprecated, please use 'vim.treesitter.language.register'",
vim.log.levels.WARN
)
ts.language.register(v, k)
end,
})
end
local function register_lang(lang, ft)
if new_lang_api then
ts.language.register(lang, ft)
return
end
filetype_to_parsername[ft] = lang
end
for ft, lang in pairs { for ft, lang in pairs {
automake = "make", automake = "make",
javascriptreact = "javascript", javascriptreact = "javascript",
ecma = "javascript", ecma = "javascript",
jsx = "javascript", jsx = "javascript",
sh = "bash",
html_tags = "html", html_tags = "html",
["typescript.tsx"] = "tsx", ["typescript.tsx"] = "tsx",
["terraform-vars"] = "terraform", ["terraform-vars"] = "terraform",
@ -47,8 +22,18 @@ for ft, lang in pairs {
mysql = "sql", mysql = "sql",
sbt = "scala", sbt = "scala",
neomuttrc = "muttrc", neomuttrc = "muttrc",
--- short-hand list from https://github.com/helix-editor/helix/blob/master/languages.toml
rs = "rust",
ex = "elixir",
js = "javascript",
ts = "typescript",
["c-sharp"] = "csharp",
hs = "haskell",
py = "python",
erl = "erlang",
typ = "typst",
} do } do
register_lang(lang, ft) ts.language.register(lang, ft)
end end
---@class InstallInfo ---@class InstallInfo
@ -73,7 +58,7 @@ end
local list = setmetatable({}, { local list = setmetatable({}, {
__newindex = function(table, parsername, parserconfig) __newindex = function(table, parsername, parserconfig)
rawset(table, parsername, parserconfig) rawset(table, parsername, parserconfig)
register_lang(parsername, parserconfig.filetype or parsername) ts.language.register(parsername, parserconfig.filetype or parsername)
end, end,
}) })
@ -2485,23 +2470,15 @@ list.templ = {
local M = { local M = {
list = list, list = list,
filetype_to_parsername = filetype_to_parsername,
} }
local function get_lang(ft)
if new_lang_api then
return ts.language.get_lang(ft)
end
return filetype_to_parsername[ft]
end
function M.ft_to_lang(ft) function M.ft_to_lang(ft)
local result = get_lang(ft) local result = ts.language.get_lang(ft)
if result then if result then
return result return result
else else
ft = vim.split(ft, ".", { plain = true })[1] ft = vim.split(ft, ".", { plain = true })[1]
return get_lang(ft) or ft return ts.language.get_lang(ft) or ft
end end
end end