fix: Windows path conversion fails for forward-slash paths

Author: crwebb85

lua/oil/fs.lua

@@ -84,6 +84,20 @@ M.is_subpath = function(root, candidate)
   return candidate_starts_with_sep or root_ends_with_sep
 end
 
+---@param path string
+---@return string
+local function normalized_path_seperators(path)
+  local leading_slashes, rem = path:match("^([\\/]*)(.*)$")
+  local normalized_rem = rem:gsub("[\\/]+", M.sep)
+  local normalized_leading = ""
+  if #leading_slashes >= 2 then
+    normalized_leading = M.sep .. M.sep
+  elseif #leading_slashes == 1 then
+    normalized_leading = M.sep
+  end
+  return string.format("%s%s", normalized_leading, normalized_rem)
+end
+
 ---@param path string
 ---@return string
 M.posix_to_os_path = function(path)
@@ -105,11 +119,12 @@ end
 ---@return string
 M.os_to_posix_path = function(path)
   if M.is_windows then
-    if M.is_absolute(path) then
-      local drive, rem = path:match("^([^:]+):\\(.*)$")
+    local normalized_path = normalized_path_seperators(path)
+    if M.is_absolute(normalized_path) then
+      local drive, rem = normalized_path:match("^([^:]+):\\(.*)$")
       return string.format("/%s/%s", drive:upper(), rem:gsub("\\", "/"))
     else
-      local newpath = path:gsub("\\", "/")
+      local newpath = normalized_path:gsub("\\", "/")
       return newpath
     end
   else

tests/fs_spec.lua

@@ -30,6 +30,16 @@ a.describe("File system", function()
     assert.equals("/C/a/b/c", fs.os_to_posix_path("C:\\a\\b\\c"))
   end)
 
+  a.it("converts Windows local path with extra backslash path seperators to posix", function()
+    set_env_windows()
+    assert.equals("/C/a/b/c", fs.os_to_posix_path("C:\\\\a\\b\\c"))
+  end)
+
+  a.it("converts Windows local path with forward slashes to posix", function()
+    set_env_windows()
+    assert.equals("/C/a/b/c", fs.os_to_posix_path("C:/a/b/c"))
+  end)
+
   a.it("converts Windows UNC path to posix", function()
     set_env_windows()
     assert.equals("//a/b/c", fs.os_to_posix_path("\\\\a\\b\\c"))

tests/url_spec.lua

@@ -1,25 +1,35 @@
 local oil = require("oil")
 local util = require("oil.util")
+
+local uv = vim.uv or vim.loop
+
 describe("url", function()
   it("get_url_for_path", function()
     local cases = {
-      { "", "oil://" .. util.addslash(vim.fn.getcwd()) },
-      { "term://~/oil.nvim//52953:/bin/sh", "oil://" .. vim.loop.os_homedir() .. "/oil.nvim/" },
-      { "/foo/bar.txt", "oil:///foo/", "bar.txt" },
+      { "", "oil://" .. util.addslash(vim.fn.getcwd()), skip_on_windows = true },
+      {
+        "term://~/oil.nvim//52953:/bin/sh",
+        "oil://" .. vim.loop.os_homedir() .. "/oil.nvim/",
+        skip_on_windows = true,
+      },
+      { "/foo/bar.txt", "oil:///foo/", "bar.txt", skip_on_windows = true },
       { "oil:///foo/bar.txt", "oil:///foo/", "bar.txt" },
       { "oil:///", "oil:///" },
       { "oil-ssh://user@hostname:8888//bar.txt", "oil-ssh://user@hostname:8888//", "bar.txt" },
       { "oil-ssh://user@hostname:8888//", "oil-ssh://user@hostname:8888//" },
     }
     for _, case in ipairs(cases) do
-      local input, expected, expected_basename = unpack(case)
-      local output, basename = oil.get_buffer_parent_url(input, true)
-      assert.equals(expected, output, string.format('Parent url for path "%s" failed', input))
-      assert.equals(
-        expected_basename,
-        basename,
-        string.format('Basename for path "%s" failed', input)
-      )
+      local is_skip = case.skip_on_windows and uv.os_uname().version:match("Windows")
+      if not is_skip then
+        local input, expected, expected_basename = unpack(case)
+        local output, basename = oil.get_buffer_parent_url(input, true)
+        assert.equals(expected, output, string.format('Parent url for path "%s" failed', input))
+        assert.equals(
+          expected_basename,
+          basename,
+          string.format('Basename for path "%s" failed', input)
+        )
+      end
     end
   end)
 end)