feat: use vim.iconv

lewis6991 · Dec 16, 2022 · a618a4e · a618a4e
1 parent 947811c
commit a618a4e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/lua/gitsigns.lua b/lua/gitsigns.lua
diff --git a/lua/gitsigns/git.lua b/lua/gitsigns/git.lua
diff --git a/teal/gitsigns.tl b/teal/gitsigns.tl
@@ -222,6 +222,9 @@ local attach_throttled = throttle_by_id(function(cbuf: integer, aucmd: string)
 
   local file, commit = get_buf_path(cbuf)
   local encoding = vim.bo[cbuf].fileencoding
+  if encoding == '' then
+    encoding = 'utf-8'
+  end
 
   local file_dir = util.dirname(file)
 

diff --git a/teal/gitsigns/git.tl b/teal/gitsigns/git.tl
@@ -359,11 +359,17 @@ function Repo:get_show_text(object: string, encoding: string): {string}, string
   local stdout, stderr = self:command({'show', object}, {suppress_stderr = true})
 
   if encoding ~= 'utf-8' then
-    scheduler()
-    for i, l in ipairs(stdout) do
-      -- TODO(lewis6991): How should we handle blob types?
-      if vim.fn.type(l) == vim.v.t_string then
-        stdout[i] = vim.fn.iconv(l, encoding, 'utf-8')
+    if vim.iconv then
+      for i, l in ipairs(stdout) do
+        stdout[i] = vim.iconv(l, encoding, 'utf-8')
+      end
+    else
+      scheduler()
+      for i, l in ipairs(stdout) do
+        -- vimscript will interpret strings containing NUL as blob type
+        if vim.fn.type(l) == vim.v.t_string then
+          stdout[i] = vim.fn.iconv(l, encoding, 'utf-8')
+        end
       end
     end
   end