diff options
| author | Mathias Fußenegger <mfussenegger@users.noreply.github.com> | 2020-05-05 05:06:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 20:06:40 -0700 |
| commit | 2c40a38b39a944a3e1a90302c1061b4e6e3ba6ac (patch) | |
| tree | e134086377ede933906843a227d7cade84258722 /runtime/lua/vim/uri.lua | |
| parent | ebee77e73c2977e8b13e0b8c98ad65840bfa2eb3 (diff) | |
| download | rneovim-2c40a38b39a944a3e1a90302c1061b4e6e3ba6ac.tar.gz rneovim-2c40a38b39a944a3e1a90302c1061b4e6e3ba6ac.tar.bz2 rneovim-2c40a38b39a944a3e1a90302c1061b4e6e3ba6ac.zip | |
LSP: Avoid URI-to-fname conversion for non-file URIs #12243
Fixes https://github.com/neovim/neovim/issues/12210
Diffstat (limited to 'runtime/lua/vim/uri.lua')
| -rw-r--r-- | runtime/lua/vim/uri.lua | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua index d91fb7ffd3..e28cc9e20f 100644 --- a/runtime/lua/vim/uri.lua +++ b/runtime/lua/vim/uri.lua @@ -66,7 +66,13 @@ local function uri_from_fname(path) end local function uri_from_bufnr(bufnr) - return uri_from_fname(vim.api.nvim_buf_get_name(bufnr)) + local fname = vim.api.nvim_buf_get_name(bufnr) + local scheme = fname:match("^([a-z]+)://.*") + if scheme then + return fname + else + return uri_from_fname(fname) + end end local function uri_to_fname(uri) @@ -83,7 +89,12 @@ end -- Return or create a buffer for a uri. local function uri_to_bufnr(uri) - return vim.fn.bufadd((uri_to_fname(uri))) + local scheme = assert(uri:match("^([a-z]+)://.*"), 'Uri must contain a scheme: ' .. uri) + if scheme == 'file' then + return vim.fn.bufadd(uri_to_fname(uri)) + else + return vim.fn.bufadd(uri) + end end return { |