Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use filetypes instead of langs from treesitter #1175

Merged
merged 6 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/luasnip.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*luasnip.txt* For NVIM v0.8.0 Last change: 2024 May 14
*luasnip.txt* For NVIM v0.8.0 Last change: 2024 May 17

==============================================================================
Table of Contents *luasnip-table-of-contents*
Expand Down
29 changes: 18 additions & 11 deletions lua/luasnip/extras/filetype_functions.lua
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
local function fts_from_ts_lang(lang)
-- In case of someone using nvim <= 0.9
if vim.treesitter.language and vim.treesitter.language.get_filetypes then
return vim.treesitter.language.get_filetypes(lang)
end
return { lang }
L3MON4D3 marked this conversation as resolved.
Show resolved Hide resolved
end

local function from_cursor_pos()
-- get_parser errors if parser not present (no grammar for language).
local has_parser, parser = pcall(vim.treesitter.get_parser)

if has_parser then
local cursor = require("luasnip.util.util").get_cursor_0ind()
-- assumption: languagetree uses 0-indexed byte-ranges.
return {
parser
:language_for_range({
cursor[1],
cursor[2],
cursor[1],
cursor[2],
})
:lang(),
}
local lang = parser
:language_for_range({
cursor[1],
cursor[2],
cursor[1],
cursor[2],
})
:lang()
return fts_from_ts_lang(lang)
else
return {}
end
end

local function from_filetype()
return vim.split(vim.bo.filetype, ".", true)
return vim.split(vim.bo.filetype, ".", { plain = true, trimemtpy = false })
end

-- NOTE: Beware that the resulting filetypes may differ from the ones in `vim.bo.filetype`. (for
Expand Down