From 3b3a6b23a120e69ddc980c9d32840ecd521fbff9 Mon Sep 17 00:00:00 2001
From: Steven Arcangeli <stevearc@stevearc.com>
Date: Tue, 23 Apr 2024 20:21:56 -0700
Subject: [PATCH] fix(windows): treat both backslash and frontslash as path
 separators (#336)

---
 lua/oil/mutator/init.lua   |  4 +++-
 lua/oil/mutator/parser.lua | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lua/oil/mutator/init.lua b/lua/oil/mutator/init.lua
index ccd23dd..b4f5278 100644
--- a/lua/oil/mutator/init.lua
+++ b/lua/oil/mutator/init.lua
@@ -4,6 +4,7 @@ local cache = require("oil.cache")
 local columns = require("oil.columns")
 local config = require("oil.config")
 local constants = require("oil.constants")
+local fs = require("oil.fs")
 local lsp_helpers = require("oil.lsp.helpers")
 local oil = require("oil")
 local parser = require("oil.mutator.parser")
@@ -99,7 +100,8 @@ M.create_actions_from_diffs = function(all_diffs)
           table.insert(by_id, diff)
         else
           -- Parse nested files like foo/bar/baz
-          local pieces = vim.split(diff.name, "/")
+          local path_sep = fs.is_windows and "[/\\]" or "/"
+          local pieces = vim.split(diff.name, path_sep)
           local url = parent_url:gsub("/$", "")
           for i, v in ipairs(pieces) do
             local is_last = i == #pieces
diff --git a/lua/oil/mutator/parser.lua b/lua/oil/mutator/parser.lua
index cd94914..95e1c06 100644
--- a/lua/oil/mutator/parser.lua
+++ b/lua/oil/mutator/parser.lua
@@ -210,23 +210,26 @@ M.parse = function(bufnr)
       end
       local parsed_entry = result.data
       local entry = result.entry
-      if not parsed_entry.name or parsed_entry.name:match("/") or not entry then
-        local message
-        if not parsed_entry.name then
-          message = "No filename found"
-        elseif not entry then
-          message = "Could not find existing entry (was the ID changed?)"
-        else
-          message = "Filename cannot contain '/'"
-        end
+
+      local err_message
+      if not parsed_entry.name then
+        err_message = "No filename found"
+      elseif not entry then
+        err_message = "Could not find existing entry (was the ID changed?)"
+      elseif parsed_entry.name:match("/") or parsed_entry.name:match(fs.sep) then
+        err_message = "Filename cannot contain path separator"
+      end
+      if err_message then
         table.insert(errors, {
-          message = message,
+          message = err_message,
           lnum = i - 1,
           end_lnum = i,
           col = 0,
         })
         goto continue
       end
+      assert(entry)
+
       check_dupe(parsed_entry.name, i)
       local meta = entry[FIELD_META]
       if original_entries[parsed_entry.name] == parsed_entry.id then