Merge pull request #40 from koki-develop/multibyte-string

model.go

@@ -239,7 +239,7 @@ func (m *model) itemView(match Match, cursorLine bool) string {
 	}
 
 	// write item
-	for ci, c := range match.Str {
+	for ci, c := range []rune(match.Str) {
 		// matches
 		if intContains(match.MatchedIndexes, ci) {
 			if cursorLine {

search.go

@@ -4,6 +4,7 @@ import (
 	"sort"
 	"strings"
 	"sync"
+	"unicode/utf8"
 )
 
 var (
@@ -143,19 +144,20 @@ func fuzzySearch(str, search string, option searchOption) (Match, bool) {
 	}
 
 	// Create a slice to store the matched indexes.
-	matchedIndexes := make([]int, 0, len(search))
+	matchedIndexes := make([]int, 0, utf8.RuneCountInString(search))
 	j := 0
 
 	// Check for matching between the item's characters and the search string.
-	for i, r := range item {
-		if j < len(search) && r == rune(search[j]) {
+	searchRunes := []rune(search)
+	for i, r := range []rune(item) {
+		if j < len(searchRunes) && r == searchRunes[j] {
 			matchedIndexes = append(matchedIndexes, i)
 			j++
 		}
 	}
 
 	// Returns Match if all characters in the search string match.
-	if j == len(search) {
+	if j == len(searchRunes) {
 		return Match{Str: str, MatchedIndexes: matchedIndexes}, true
 	} else {
 		return Match{}, false

search_test.go

@@ -42,6 +42,18 @@ func Test_fuzzySearch(t *testing.T) {
 		{str: "abc", search: "d"},
 		{str: "abc", search: "abcd"},
 
+		{str: "こんにちは", search: "", matchedIndexes: []int{}},
+		{str: "こんにちは", search: "こ", matchedIndexes: []int{0}},
+		{str: "こんにちは", search: "こん", matchedIndexes: []int{0, 1}},
+		{str: "こんにちは", search: "こんに", matchedIndexes: []int{0, 1, 2}},
+		{str: "こんにちは", search: "こんにち", matchedIndexes: []int{0, 1, 2, 3}},
+		{str: "こんにちは", search: "こんにちは", matchedIndexes: []int{0, 1, 2, 3, 4}},
+		{str: "こんにちは", search: "ん", matchedIndexes: []int{1}},
+		{str: "こんにちは", search: "んに", matchedIndexes: []int{1, 2}},
+		{str: "こんにちは", search: "んにち", matchedIndexes: []int{1, 2, 3}},
+		{str: "こんにちは", search: "んにちは", matchedIndexes: []int{1, 2, 3, 4}},
+		{str: "こんにちは", search: "こには", matchedIndexes: []int{0, 2, 4}},
+
 		{str: "xaxbxc", search: "a", matchedIndexes: []int{1}},
 		{str: "xaxbxc", search: "ab", matchedIndexes: []int{1, 3}},
 		{str: "xaxbxc", search: "ac", matchedIndexes: []int{1, 5}},