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

Fixes https://github.com/neovim/neovim/issues/12210

2 files changed, 24 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 {
diff --git a/test/functional/lua/uri_spec.lua b/test/functional/lua/uri_spec.lua
index 128c7c6137..a3b8e685e1 100644
--- a/test/functional/lua/uri_spec.lua
+++ b/test/functional/lua/uri_spec.lua
@@ -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)