feat: use vim.iconv

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

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/lua/gitsigns/git.lua b/lua/gitsigns/git.lua
diff --git a/teal/gitsigns/git.tl b/teal/gitsigns/git.tl
@@ -360,10 +360,16 @@ function Repo:get_show_text(object: string, encoding: string): {string}, string
 
   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
+      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