LSP: Avoid URI-to-fname conversion for non-file URIs #12243

Fixes https://github.com/neovim/neovim/issues/12210
This commit is contained in:
Mathias Fußenegger
2020-05-05 05:06:40 +02:00
committed by GitHub
parent ebee77e73c
commit 2c40a38b39
2 changed files with 24 additions and 2 deletions

View File

@@ -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 {

View File

@@ -113,4 +113,15 @@ describe('URI methods', function()
end)
end)
end)
describe('uri to bufnr', function()
it('uri_to_bufnr & uri_from_bufnr returns original uri for non-file uris', function()
local uri = 'jdt://contents/java.base/java.util/List.class?=sql/%5C/home%5C/user%5C/.jabba%5C/jdk%5C/openjdk%5C@1.14.0%5C/lib%5C/jrt-fs.jar%60java.base=/javadoc_location=/https:%5C/%5C/docs.oracle.com%5C/en%5C/java%5C/javase%5C/14%5C/docs%5C/api%5C/=/%3Cjava.util(List.class'
local test_case = string.format([[
local uri = '%s'
return vim.uri_from_bufnr(vim.uri_to_bufnr(uri))
]], uri)
eq(uri, exec_lua(test_case))
end)
end)
end)