_normalize_path: removed redundant table.remove in discarding drive path logic which I did not notice.

Author: shikorido

lua/plenary/path.lua

@@ -38,7 +38,7 @@ path.sep = (function()
     else
       --qqq
       --vim.notify("os: " .. vim.inspect(os) .. ", U.is_msys: " .. vim.inspect(U.is_msys2), vim.log.levels.ERROR)
-      -- msys2 works fine with backslashes as well as cmd.exe/powershell.exe
+      -- msys2 works fine with forward slashes as well as cmd.exe/powershell.exe
       -- but not UNC paths if the paths will ever be supported.
       -- Maybe returning "/" as path separator can break something in existing logic.
       --return "/"
@@ -138,15 +138,23 @@ local function _normalize_path(filename, cwd)
 
   local has = string.find(filename, path.sep .. "..", 1, true) or string.find(filename, ".." .. path.sep, 1, true)
 
+  --qqq
+  --vim.notify("_normalize_path: has = " .. vim.inspect(has), vim.log.levels.WARN)
+  --!qqq
+
   if has then
     local is_abs = is_absolute(filename, path.sep)
+    --qqq
+    --vim.notify("_normalize_path: is_abs = " .. vim.inspect(is_abs), vim.log.levels.WARN)
+    --!qqq
     local split_without_disk_name = function(filename_local)
       local parts = _split_by_separator(filename_local)
       -- Remove disk name part on Windows
       if is_abs and (path.sep == "\\" or U.is_msys2) then
+        --qqq
+        --vim.notify("_normalize_path: parts = " .. vim.inspect(parts), vim.log.levels.WARN)
+        --!qqq
         table.remove(parts, 1)
-        table.remove(parts, 1)
-        --table.remove(parts, 1)
       end
       return parts
     end
@@ -188,6 +196,10 @@ local function _normalize_path(filename, cwd)
   return out_file
 end
 
+--qqq
+--vim.notify("_normalize_path: call returned " .. vim.inspect(_normalize_path("C:\\msys64\\home\\..\\123", "C:\\msys64\\123")), vim.log.levels.WARN)
+--!qqq
+
 local clean = function(pathname)
   if is_uri(pathname) then
     return pathname

lua/plenary/utils.lua

@@ -59,7 +59,7 @@ function M.posix_to_windows(posix_path)
 
 
   -- For edgy-ephemeral cases when vim.fn.expand() eats posix-style path.
-  -- In that case we get forward slashes everywhere which we don't need
+  -- In that case we get backslashes everywhere which we don't need
   -- when working with libuv which uses WinAPI under the hood.
   -- E.g. vim.fn.expand("/home/User") gives "\home\User".
   posix_path = posix_path:gsub("\\", "/")
@@ -92,26 +92,27 @@ function M.posix_to_windows(posix_path)
   -- Idk if WezTerm paths behaviour leaks to msys2 actually...
   if not prefix_changed then
     if #posix_path == 2 and posix_path:find("/[A-Za-z]") then
-      --vim.notify("Only '[A-Za-z]:' case: " .. posix_path, vim.log.levels.WARN)
+      --vim.notify("Only '/[A-Za-z]' case: " .. posix_path, vim.log.levels.WARN)
       posix_path = posix_path:gsub("^/([A-Za-z])", "%1:\\")
       prefix_changed = true
     else
-      --vim.notify("'[A-Za-z]:?/' case: " .. posix_path, vim.log.levels.WARN)
+      --vim.notify("'/[A-Za-z]:?/' case: " .. posix_path, vim.log.levels.WARN)
       posix_path = posix_path:gsub("^/([A-Za-z]):?/", "%1:\\")
       prefix_changed = true
     end
   end
 
-  -- Lets try to be msys2 compliant for testing.
+  -- Lets try to use posix-style paths for testing.
   --posix_path = posix_path:gsub("^/([A-Za-z]):?([^0-9A-Za-z_-]?)", "/%1%2")
 
 
   -- Replace remaining forward slashes with backslashes.
   posix_path = posix_path:gsub("/", "\\")
 
-  -- For bash.exe (nvim shell) it is better to use backslashes
-  -- cause forward slashes must be escaped. Need to come up with something
-  -- cause nvim for windows (even clang64 binary) prefers windows-style paths (with backslashes?).
+  -- For bash.exe (nvim shell) it is better to use forward slashes
+  -- cause backslashes must to be escaped. Need to come up with something
+  -- cause nvim for windows (even clang64 binary) prefers windows-style paths (but works with forward slashes as well?).
+  -- UPD. "set shellslash" makes the trick by converting backslashes to forward slashes in shell invocations.
   --posix_path = posix_path:gsub("\\", "/")