Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-15 17:57:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix handling of unicode characters in query string

Browse Source
This commit is contained in:
Junegunn Choi 2020-07-28 12:58:37 +09:00
parent 08a6fd4ad4
commit aa5dae391b
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/terminal.go
View File

@ -405,8 +405,8 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
} }
renderer = tui.NewLightRenderer(opts.Theme, opts.Black, opts.Mouse, opts.Tabstop, opts.ClearOnExit, false, maxHeightFunc) renderer = tui.NewLightRenderer(opts.Theme, opts.Black, opts.Mouse, opts.Tabstop, opts.ClearOnExit, false, maxHeightFunc)
} }
wordRubout := "[^[:alnum:]][[:alnum:]]" wordRubout := "[^\\pL\\pN][\\pL\\pN]"
wordNext := "[[:alnum:]][^[:alnum:]]|(.$)" wordNext := "[\\pL\\pN][^\\pL\\pN]|(.$)"
if opts.FileWord { if opts.FileWord {
sep := regexp.QuoteMeta(string(os.PathSeparator)) sep := regexp.QuoteMeta(string(os.PathSeparator))
wordRubout = fmt.Sprintf("%s[^%s]", sep, sep) wordRubout = fmt.Sprintf("%s[^%s]", sep, sep)
@ -1232,7 +1232,8 @@ func findLastMatch(pattern string, str string) int {
if locs == nil { if locs == nil {
return -1 return -1
} }
return locs[len(locs)-1][0] prefix := []rune(str[:locs[len(locs)-1][0]])
return len(prefix)
} }
func findFirstMatch(pattern string, str string) int { func findFirstMatch(pattern string, str string) int {
@ -1244,7 +1245,8 @@ func findFirstMatch(pattern string, str string) int {
if loc == nil { if loc == nil {
return -1 return -1
} }
return loc[0] prefix := []rune(str[:loc[0]])
return len(prefix)
} }
func copySlice(slice []rune) []rune { func copySlice(slice []rune) []rune {