Skip to content

Commit

Permalink
bugfix Colon followed by emoji fails
Browse files Browse the repository at this point in the history
  • Loading branch information
kyokomi committed Mar 3, 2016
1 parent 1f5ed6f commit 24efda3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
21 changes: 9 additions & 12 deletions emoji.go
Expand Up @@ -30,29 +30,26 @@ func emojize(x string) string {
}

func replaseEmoji(input *bytes.Buffer) string {
r := ""
emoji := bytes.NewBufferString(":")
for {
i, _, err := input.ReadRune()
if err != nil {
// not replase
r = emoji.String()
break
return emoji.String()
}

emoji.WriteRune(i)

if unicode.IsSpace(i) {
r = emoji.String()
break
if i == ':' && emoji.Len() == 1 {
return emoji.String() + replaseEmoji(input)
}

if i == ':' {
r = emojize(emoji.String())
break
emoji.WriteRune(i)
switch {
case unicode.IsSpace(i):
return emoji.String()
case i == ':':
return emojize(emoji.String())
}
}
return r
}

func compile(x string) string {
Expand Down
13 changes: 13 additions & 0 deletions emoji_test.go
Expand Up @@ -27,6 +27,19 @@ func TestMultiColons(t *testing.T) {
}
}

func TestContinuityColons(t *testing.T) {
var buf bytes.Buffer
_, err := Fprint(&buf, "::smile:")
if err != nil {
t.Error("Fprint ", err)
}

testCase := ":" + emojize(":smile:")
if buf.String() != testCase {
t.Error("Fprint ", buf.String(), "!=", testCase)
}
}

func TestCodeMap(t *testing.T) {
m := CodeMap()
if &emojiCodeMap == &m {
Expand Down

0 comments on commit 24efda3

Please sign in to comment.