#1253 only pad git icons when they are present (#1259)

This commit is contained in:
Alexander Courtis
2022-05-14 17:35:44 +10:00
committed by GitHub
parent f85af83f13
commit 90d7b8edb1

View File

@@ -94,7 +94,7 @@ function Builder:_unwrap_git_data(git_icons_and_hl_groups, offset)
for _, v in ipairs(git_icons_and_hl_groups) do for _, v in ipairs(git_icons_and_hl_groups) do
if #v.icon > 0 then if #v.icon > 0 then
self:_insert_highlight(v.hl, offset + #icon, offset + #icon + #v.icon) self:_insert_highlight(v.hl, offset + #icon, offset + #icon + #v.icon)
icon = icon .. v.icon .. self.git_icon_padding icon = icon .. v.icon
end end
end end
return icon return icon
@@ -135,11 +135,11 @@ end
function Builder:_format_line(before, after, git_icons) function Builder:_format_line(before, after, git_icons)
return string.format( return string.format(
"%s%s%s %s", "%s%s%s%s",
before, before,
self.is_git_after and "" or git_icons, #git_icons > 0 and not self.is_git_after and git_icons .. self.git_icon_padding or "",
after, after,
self.is_git_after and git_icons or "" #git_icons > 0 and self.is_git_after and self.git_icon_padding .. git_icons or ""
) )
end end