aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim
diff options
context:
space:
mode:
authormarkstegeman <markstegeman@users.noreply.github.com>2025-03-19 13:41:25 +0100
committerGitHub <noreply@github.com>2025-03-19 05:41:25 -0700
commit21cbd9000748696b86ae97d08ee659d95917a95a (patch)
tree820ef19fa7bcf7ed27e7b989d4f1ba25596b62cd /runtime/lua/vim
parentf1fcf653cb7c3e738c1d07b1e087f6cf9d6ca9c5 (diff)
downloadrneovim-21cbd9000748696b86ae97d08ee659d95917a95a.tar.gz
rneovim-21cbd9000748696b86ae97d08ee659d95917a95a.tar.bz2
rneovim-21cbd9000748696b86ae97d08ee659d95917a95a.zip
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 <justinkz@gmail.com>
Diffstat (limited to 'runtime/lua/vim')
-rw-r--r--runtime/lua/vim/filetype.lua11
1 files changed, 10 insertions, 1 deletions
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