Git icons mess up highlighting of last character

[nwaywood]

Description

With git integration disabled, the highlighting of files/folders works as expected

But when git in enabled (putting git icons in front of the folder name), the highlighting gets messed up and the last character is no longer highlighted properly

This used to work for me, but I just ran :PackerSync to get the latest version and I started having this issue. On commit 82ec79a this works as expected

Neovim version

NVIM v0.7.0                                                                                                    
Build type: Release                                                                                            
LuaJIT 2.1.0-beta3

Operating system and version

macOS 12.3.1

nvim-tree version

aefa66c

Minimal config

vim.cmd [[set runtimepath=$VIMRUNTIME]]
vim.cmd [[set packpath=/tmp/nvt-min/site]]
local package_root = "/tmp/nvt-min/site/pack"
local install_path = package_root .. "/packer/start/packer.nvim"
local function load_plugins()
  require("packer").startup {
    {
      "wbthomason/packer.nvim",
      "kyazdani42/nvim-tree.lua",
      "kyazdani42/nvim-web-devicons",
      -- ADD PLUGINS THAT ARE _NECESSARY_ FOR REPRODUCING THE ISSUE
    },
    config = {
      package_root = package_root,
      compile_path = install_path .. "/plugin/packer_compiled.lua",
      display = { non_interactive = true },
    },
  }
end
if vim.fn.isdirectory(install_path) == 0 then
  print "Installing nvim-tree and dependencies."
  vim.fn.system { "git", "clone", "--depth=1", "https://github.com/wbthomason/packer.nvim", install_path }
end
load_plugins()
require("packer").sync()
vim.cmd [[autocmd User PackerComplete ++once echo "Ready!" | lua setup()]]
vim.opt.termguicolors = true
vim.opt.cursorline = true

-- MODIFY NVIM-TREE SETTINGS THAT ARE _NECESSARY_ FOR REPRODUCING THE ISSUE
_G.setup = function()
  require("nvim-tree").setup {}
end

Steps to reproduce

1. cd to a directory where there are git changes
2. Open nvim with the default nvt-min.lua file. nvim -nu /tmp/nvt-min.lua
3. :NvimTreeToggle