fix(windows): can delete non-ascii filenames to trash (#323)

stevearc · Mar 4, 2024 · 18dfd24 · 18dfd24
1 parent c437f3c
commit 18dfd24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/lua/oil/adapters/trash/windows/powershell-connection.lua b/lua/oil/adapters/trash/windows/powershell-connection.lua
@@ -27,15 +27,12 @@ end
 
 ---@param init_command? string
 function PowershellConnection:_init(init_command)
+  -- 65001 is the UTF-8 codepage
+  -- powershell needs to be launched with the UTF-8 codepage to use it for both stdin and stdout
   local jid = vim.fn.jobstart({
-    "powershell",
-    "-NoProfile",
-    "-NoLogo",
-    "-ExecutionPolicy",
-    "Bypass",
-    "-NoExit",
-    "-Command",
-    "-",
+    "cmd",
+    "/c",
+    '"chcp 65001 && powershell -NoProfile -NoLogo -ExecutionPolicy Bypass -NoExit -Command -"',
   }, {
     ---@param data string[]
     on_stdout = function(_, data)

diff --git a/lua/oil/adapters/trash/windows/powershell-trash.lua b/lua/oil/adapters/trash/windows/powershell-trash.lua
@@ -10,10 +10,8 @@ local Powershell = require("oil.adapters.trash.windows.powershell-connection")
 
 local M = {}
 
--- The first line configures Windows Powershell to use UTF-8 for input and output
 -- 0xa is the constant for Recycle Bin. See https://learn.microsoft.com/en-us/windows/win32/api/shldisp/ne-shldisp-shellspecialfolderconstants
 local list_entries_init = [[
-$OutputEncoding = [Console]::InputEncoding = [Console]::OutputEncoding = New-Object System.Text.UTF8Encoding
 $shell = New-Object -ComObject 'Shell.Application'
 $folder = $shell.NameSpace(0xa)
 ]]