From 54fc54fdd3ac9416e42b2dc5c9816ef9915d4de9 Mon Sep 17 00:00:00 2001
From: James Trew <66286082+jamestrew@users.noreply.github.com>
Date: Sun, 9 Apr 2023 04:04:20 -0400
Subject: [PATCH] fix: icon hl width for various pickers (#2450)

(cherry picked from commit c20d4fb592bfe498536e49ad11a5d2d6e3fb8365)
---
 lua/telescope/make_entry.lua | 10 +++++-----
 lua/telescope/utils.lua      |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lua/telescope/make_entry.lua b/lua/telescope/make_entry.lua
index 541346a..04666ff 100644
--- a/lua/telescope/make_entry.lua
+++ b/lua/telescope/make_entry.lua
@@ -157,13 +157,13 @@ do
 
     mt_file_entry.cwd = cwd
     mt_file_entry.display = function(entry)
-      local hl_group
+      local hl_group, icon
       local display = utils.transform_path(opts, entry.value)
 
-      display, hl_group = utils.transform_devicons(entry.value, display, disable_devicons)
+      display, hl_group, icon = utils.transform_devicons(entry.value, display, disable_devicons)
 
       if hl_group then
-        return display, { { { 1, 3 }, hl_group } }
+        return display, { { { 1, #icon }, hl_group } }
       else
         return display
       end
@@ -319,14 +319,14 @@ do
           end
         end
 
-        local display, hl_group = utils.transform_devicons(
+        local display, hl_group, icon = utils.transform_devicons(
           entry.filename,
           string.format(display_string, display_filename, coordinates, entry.text),
           disable_devicons
         )
 
         if hl_group then
-          return display, { { { 1, 3 }, hl_group } }
+          return display, { { { 1, #icon }, hl_group } }
         else
           return display
         end
diff --git a/lua/telescope/utils.lua b/lua/telescope/utils.lua
index 0e2eb06..1d60a54 100644
--- a/lua/telescope/utils.lua
+++ b/lua/telescope/utils.lua
@@ -460,13 +460,14 @@ utils.transform_devicons = load_once(function()
       local icon, icon_highlight = devicons.get_icon(basename, utils.file_extension(basename), { default = false })
       if not icon then
         icon, icon_highlight = devicons.get_icon(basename, nil, { default = true })
+        icon = icon or " "
       end
-      local icon_display = (icon or " ") .. " " .. (display or "")
+      local icon_display = icon .. " " .. (display or "")
 
       if conf.color_devicons then
-        return icon_display, icon_highlight
+        return icon_display, icon_highlight, icon
       else
-        return icon_display, nil
+        return icon_display, nil, icon
       end
     end
   else