diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-10-15 12:03:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 12:03:41 -0700 |
| commit | 68b2a9e5693592d98d8a3e84bcad288704f66bb1 (patch) | |
| tree | d7420b71e1e7e22f1a2298487941f9bb5b50bb32 /runtime/lua/vim/uri.lua | |
| parent | 5fd4557573c73a6b41b702b1ee39151b5bd7e5fd (diff) | |
| download | rneovim-68b2a9e5693592d98d8a3e84bcad288704f66bb1.tar.gz rneovim-68b2a9e5693592d98d8a3e84bcad288704f66bb1.tar.bz2 rneovim-68b2a9e5693592d98d8a3e84bcad288704f66bb1.zip | |
fix: correctly capture uri scheme on windows (#16027)
closes https://github.com/neovim/neovim/issues/15261
* normalize uri path to forward slashes on windows
* use a capture group on windows that avoids mistaking drive letters as uri scheme
Diffstat (limited to 'runtime/lua/vim/uri.lua')
| -rw-r--r-- | runtime/lua/vim/uri.lua | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua index a3e79a0f2b..5d8d4fa169 100644 --- a/runtime/lua/vim/uri.lua +++ b/runtime/lua/vim/uri.lua @@ -75,13 +75,22 @@ local function uri_from_fname(path) end local URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9+-.]*):.*' +local WINDOWS_URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9+-.]*):[a-zA-Z]:.*' --- Get a URI from a bufnr ---@param bufnr (number): Buffer number ---@return URI local function uri_from_bufnr(bufnr) local fname = vim.api.nvim_buf_get_name(bufnr) - local scheme = fname:match(URI_SCHEME_PATTERN) + local volume_path = fname:match("^([a-zA-Z]:).*") + local is_windows = volume_path ~= nil + local scheme + if is_windows then + fname = fname:gsub("\\", "/") + scheme = fname:match(WINDOWS_URI_SCHEME_PATTERN) + else + scheme = fname:match(URI_SCHEME_PATTERN) + end if scheme then return fname else |