michael/lf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use rune indices for word matching

Browse Source 
Related #193
This commit is contained in:
Gokcehan 2019-12-23 16:00:10 +03:00
parent b0064df32c
commit e0747fa2f9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
eval.go
View File

@ -1225,22 +1225,22 @@ func (e *callExpr) eval(app *app, args []string) {
if len(app.ui.cmdAccRight) == 0 { if len(app.ui.cmdAccRight) == 0 {
return return
} }
loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight)) loc := reWordEnd.FindStringSubmatchIndex(string(app.ui.cmdAccRight))
if loc == nil { if loc == nil {
return return
} }
ind := loc[0] + 1 ind := loc[3]
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...)
app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:]) app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
case "cmd-word-back": case "cmd-word-back":
if len(app.ui.cmdAccLeft) == 0 { if len(app.ui.cmdAccLeft) == 0 {
return return
} }
locs := reWordBeg.FindAllStringIndex(string(app.ui.cmdAccLeft), -1) locs := reWordBeg.FindAllStringSubmatchIndex(string(app.ui.cmdAccLeft), -1)
if locs == nil { if locs == nil {
return return
} }
ind := locs[len(locs)-1][1] - 1 ind := locs[len(locs)-1][3]
old := app.ui.cmdAccRight old := app.ui.cmdAccRight
app.ui.cmdAccRight = append([]rune{}, []rune(string(app.ui.cmdAccLeft)[ind:])...) app.ui.cmdAccRight = append([]rune{}, []rune(string(app.ui.cmdAccLeft)[ind:])...)
app.ui.cmdAccRight = append(app.ui.cmdAccRight, old...) app.ui.cmdAccRight = append(app.ui.cmdAccRight, old...)
@ -1256,11 +1256,11 @@ func (e *callExpr) eval(app *app, args []string) {
return return
} }
app.ui.cmdAccRight[ind] = unicode.ToUpper(app.ui.cmdAccRight[ind]) app.ui.cmdAccRight[ind] = unicode.ToUpper(app.ui.cmdAccRight[ind])
loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight)) loc := reWordEnd.FindStringSubmatchIndex(string(app.ui.cmdAccRight))
if loc == nil { if loc == nil {
return return
} }
ind = loc[0] + 1 ind = loc[3]
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...)
app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:]) app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
update(app) update(app)
@ -1268,22 +1268,22 @@ func (e *callExpr) eval(app *app, args []string) {
if len(app.ui.cmdAccRight) == 0 { if len(app.ui.cmdAccRight) == 0 {
return return
} }
loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight)) loc := reWordEnd.FindStringSubmatchIndex(string(app.ui.cmdAccRight))
if loc == nil { if loc == nil {
return return
} }
ind := loc[0] + 1 ind := loc[3]
app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:]) app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
update(app) update(app)
case "cmd-uppercase-word": case "cmd-uppercase-word":
if len(app.ui.cmdAccRight) == 0 { if len(app.ui.cmdAccRight) == 0 {
return return
} }
loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight)) loc := reWordEnd.FindStringSubmatchIndex(string(app.ui.cmdAccRight))
if loc == nil { if loc == nil {
return return
} }
ind := loc[0] + 1 ind := loc[3]
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(strings.ToUpper(string(app.ui.cmdAccRight)[:ind]))...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(strings.ToUpper(string(app.ui.cmdAccRight)[:ind]))...)
app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:]) app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
update(app) update(app)
@ -1291,11 +1291,11 @@ func (e *callExpr) eval(app *app, args []string) {
if len(app.ui.cmdAccRight) == 0 { if len(app.ui.cmdAccRight) == 0 {
return return
} }
loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight)) loc := reWordEnd.FindStringSubmatchIndex(string(app.ui.cmdAccRight))
if loc == nil { if loc == nil {
return return
} }
ind := loc[0] + 1 ind := loc[3]
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(strings.ToLower(string(app.ui.cmdAccRight)[:ind]))...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(strings.ToLower(string(app.ui.cmdAccRight)[:ind]))...)
app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:]) app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
update(app) update(app)
@ -1310,9 +1310,9 @@ func (e *callExpr) eval(app *app, args []string) {
} }
if len(app.ui.cmdAccRight) > 0 { if len(app.ui.cmdAccRight) > 0 {
loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight)) loc := reWordEnd.FindStringSubmatchIndex(string(app.ui.cmdAccRight))
if loc != nil { if loc != nil {
ind := loc[0] + 1 ind := loc[3]
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...)
app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:]) app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
} }