From 691708a76ef6bb0eee8869582647a19946d787c1 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 16 Jun 2019 19:54:54 +0300
Subject: Improve emoji autocompletion when the same emoji has many names

---
 ui/room-view.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ui')

diff --git a/ui/room-view.go b/ui/room-view.go
index 00aa09a..a257f63 100644
--- a/ui/room-view.go
+++ b/ui/room-view.go
@@ -333,13 +333,23 @@ func (view *RoomView) autocompleteEmoji(word string) (completions []string) {
 	if len(word) == 0 || word[0] != ':' {
 		return
 	}
+	var valueCompletion1 string
+	var manyValues bool
 	for name, value := range emoji.CodeMap() {
 		if name == word {
 			return []string{value}
 		} else if strings.HasPrefix(name, word) {
 			completions = append(completions, name)
+			if valueCompletion1 == "" {
+				valueCompletion1 = value
+			} else if valueCompletion1 != value {
+				manyValues = true
+			}
 		}
 	}
+	if !manyValues && len(completions) > 0 {
+		return []string{emoji.CodeMap()[completions[0]]}
+	}
 	return
 }
 
-- 
cgit v1.2.3