From 21cbd9000748696b86ae97d08ee659d95917a95a Mon Sep 17 00:00:00 2001 From: markstegeman Date: Wed, 19 Mar 2025 13:41:25 +0100 Subject: fix(filetype): normalize full path before matching #32227 Problem: On Windows, treesitter query files are not recognized as such when opened from inside their directory, because the full path returned from fnamemodify(_, ':p') contains backslashes, while the filetype patterns expect forward slashes. Solution: Normalize the result of fnamemodify(_, ':p') before trying to match it to filetype patterns. Co-authored-by: Justin M. Keyes --- runtime/lua/vim/filetype.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'runtime/lua/vim') diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index cd8dabe2ca..30dde915ed 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -2565,6 +2565,15 @@ local function normalize_path(path, as_pattern) return normal end +local abspath = function(x) + return fn.fnamemodify(x, ':p') +end +if fn.has('win32') == 1 then + abspath = function(x) + return (fn.fnamemodify(x, ':p'):gsub('\\', '/')) + end +end + --- @class vim.filetype.add.filetypes --- @inlinedoc --- @field pattern? vim.filetype.mapping @@ -2873,7 +2882,7 @@ function M.match(args) name = normalize_path(name) -- First check for the simple case where the full path exists as a key - local path = fn.fnamemodify(name, ':p') + local path = abspath(name) ft, on_detect = dispatch(filename[path], path, bufnr) if ft then return ft, on_detect -- cgit