helpers: Fix bug in emoji renderer

Fixes #2391

diff --git a/helpers/emoji.go b/helpers/emoji.go
index 72550545518c41d50c135a4c8788d246761f536f..f945286500a7c28ade796611c62db1eb3603c34b 100644 (file)
--- a/helpers/emoji.go
+++ b/helpers/emoji.go
@@ -34,7 +34,6 @@ var (
 // Note that the input byte slice will be modified if needed.
 // See http://www.emoji-cheat-sheet.com/
 func Emojify(source []byte) []byte {
-
        emojiInit.Do(initEmoji)
 
        start := 0
@@ -54,7 +53,7 @@ func Emojify(source []byte) []byte {
                nextWordDelim := bytes.Index(source[j:upper], emojiWordDelim)
 
                if endEmoji < 0 {
-                       start += upper + 1
+                       start += 1
                } else if endEmoji == 0 || (nextWordDelim != -1 && nextWordDelim < endEmoji) {
                        start += endEmoji + 1
                } else {
@@ -76,7 +75,6 @@ func Emojify(source []byte) []byte {
        }
 
        return source
-
 }
 
 func initEmoji() {

diff --git a/helpers/emoji_test.go b/helpers/emoji_test.go
index 70c54cd55e63fb357c27c6a640fcf0f0adbee2e7..ede601b7a5e0d7904964e8b102c3d02221034d8f 100644 (file)
--- a/helpers/emoji_test.go
+++ b/helpers/emoji_test.go
@@ -53,12 +53,17 @@ func TestEmojiCustom(t *testing.T) {
 
 🍺`)},
                {"test :\n```bash\nthis is a test\n```\n\ntest\n\n:cool::blush:::pizza:\\:blush : : blush: :pizza:", []byte("test :\n```bash\nthis is a test\n```\n\ntest\n\n🆒😊:🍕\\:blush : : blush: 🍕")},
+               {
+                       // 2391
+                       "[a](http://gohugo.io) :smile: [r](http://gohugo.io/introduction/overview/) :beer:",
+                       []byte(`[a](http://gohugo.io) 😄 [r](http://gohugo.io/introduction/overview/) 🍺`),
+               },
        } {
 
                result := Emojify([]byte(this.input))
 
                if !reflect.DeepEqual(result, this.expect) {
-                       t.Errorf("[%d] got '%q' but expected %q", i, result, this.expect)
+                       t.Errorf("[%d] got %q but expected %q", i, result, this.expect)
                }
 
        }