Merge pull request #15 from nyaxt/fixpanic

Fix panic when counting remaining char
lithammer · Jun 19, 2018 · b18e754 · b18e754
2 parents 8261fa0 + c36657d
commit b18e754
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/fuzzy/fuzzy.go b/fuzzy/fuzzy.go
@@ -112,10 +112,7 @@ Outer:
 	}
 
 	// Count up remaining char
-	for len(target) > 0 {
-		target = target[utf8.RuneLen(rune(target[0])):]
-		runeDiff++
-	}
+	runeDiff += utf8.RuneCountInString(target)
 
 	return runeDiff
 }

diff --git a/fuzzy/fuzzy_test.go b/fuzzy/fuzzy_test.go
@@ -44,6 +44,7 @@ var fuzzyTests = []struct {
 	{"ветер", "ёлочка", false, -1},
 	{"中国", "中华人民共和国", true, 5},
 	{"日本", "中华人民共和国", false, -1},
+	{"イ", "イカ", true, 1},
 }
 
 func TestFuzzyMatch(t *testing.T) {