Skip to content

fix strips emoji fixing UI #4247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix strips emoji fixing UI #4247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pkg/gui/presentation/commits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package presentation

import (
"fmt"
"regexp"
"strings"
"time"

Expand All @@ -15,7 +16,6 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/theme"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/kyokomi/emoji/v2"
"github.com/samber/lo"
"github.com/sasha-s/go-deadlock"
"github.com/stefanhaller/git-todo-parser/todo"
Expand All @@ -37,6 +37,12 @@ type bisectBounds struct {
oldIndex int
}

func stripEmojis(text string) string {
// This regex matches most common emoji patterns
re := regexp.MustCompile(`[\x{1F600}-\x{1F64F}]|[\x{1F300}-\x{1F5FF}]|[\x{1F680}-\x{1F6FF}]|[\x{2600}-\x{26FF}]|[\x{2700}-\x{27BF}]`)
return re.ReplaceAllString(text, "")
}

func GetCommitListDisplayStrings(
common *common.Common,
commits []*models.Commit,
Expand Down Expand Up @@ -366,6 +372,7 @@ func displayCommit(
bisectInfo *git_commands.BisectInfo,
isYouAreHereCommit bool,
) []string {
_ = parseEmoji
bisectString := getBisectStatusText(bisectStatus, bisectInfo)

hashString := ""
Expand Down Expand Up @@ -423,9 +430,8 @@ func displayCommit(
if commit.Action == todo.UpdateRef {
name = strings.TrimPrefix(name, "refs/heads/")
}
if parseEmoji {
name = emoji.Sprint(name)
}

name = stripEmojis(name) // Strip emojis

mark := ""
if isYouAreHereCommit {
Expand Down