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

convert string indices to rune slice indices

Browse Source 
Related #193
This commit is contained in:
Gokcehan 2019-12-23 02:35:32 +03:00
parent 74eab96637
commit b0064df32c
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
complete.go
View File

@ -382,7 +382,7 @@ func completeShell(acc []rune) (matches []string, longestAcc []rune) {
longestAcc = []rune(longest) longestAcc = []rune(longest)
default: default:
matches, longest = matchFile(f[len(f)-1]) matches, longest = matchFile(f[len(f)-1])
longestAcc = append(acc[:len(acc)-len(f[len(f)-1])], []rune(longest)...) longestAcc = append(acc[:len(acc)-len([]rune(f[len(f)-1]))], []rune(longest)...)
} }
return return

40
eval.go
View File

@ -1204,8 +1204,8 @@ func (e *callExpr) eval(app *app, args []string) {
update(app) update(app)
case "cmd-delete-unix-word": case "cmd-delete-unix-word":
ind := strings.LastIndex(strings.TrimRight(string(app.ui.cmdAccLeft), " "), " ") + 1 ind := strings.LastIndex(strings.TrimRight(string(app.ui.cmdAccLeft), " "), " ") + 1
app.ui.cmdYankBuf = app.ui.cmdAccLeft[ind:] app.ui.cmdYankBuf = []rune(string(app.ui.cmdAccLeft)[ind:])
app.ui.cmdAccLeft = app.ui.cmdAccLeft[:ind] app.ui.cmdAccLeft = []rune(string(app.ui.cmdAccLeft)[:ind])
update(app) update(app)
case "cmd-yank": case "cmd-yank":
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, app.ui.cmdYankBuf...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, app.ui.cmdYankBuf...)
@ -1230,8 +1230,8 @@ func (e *callExpr) eval(app *app, args []string) {
return return
} }
ind := loc[0] + 1 ind := loc[0] + 1
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, app.ui.cmdAccRight[:ind]...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...)
app.ui.cmdAccRight = 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
@ -1242,9 +1242,9 @@ func (e *callExpr) eval(app *app, args []string) {
} }
ind := locs[len(locs)-1][1] - 1 ind := locs[len(locs)-1][1] - 1
old := app.ui.cmdAccRight old := app.ui.cmdAccRight
app.ui.cmdAccRight = append([]rune{}, 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...)
app.ui.cmdAccLeft = app.ui.cmdAccLeft[:ind] app.ui.cmdAccLeft = []rune(string(app.ui.cmdAccLeft)[:ind])
case "cmd-capitalize-word": case "cmd-capitalize-word":
if len(app.ui.cmdAccRight) == 0 { if len(app.ui.cmdAccRight) == 0 {
return return
@ -1261,8 +1261,8 @@ func (e *callExpr) eval(app *app, args []string) {
return return
} }
ind = loc[0] + 1 ind = loc[0] + 1
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, app.ui.cmdAccRight[:ind]...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...)
app.ui.cmdAccRight = app.ui.cmdAccRight[ind:] app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
update(app) update(app)
case "cmd-delete-word": case "cmd-delete-word":
if len(app.ui.cmdAccRight) == 0 { if len(app.ui.cmdAccRight) == 0 {
@ -1273,7 +1273,7 @@ func (e *callExpr) eval(app *app, args []string) {
return return
} }
ind := loc[0] + 1 ind := loc[0] + 1
app.ui.cmdAccRight = 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 {
@ -1284,8 +1284,8 @@ func (e *callExpr) eval(app *app, args []string) {
return return
} }
ind := loc[0] + 1 ind := loc[0] + 1
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 = app.ui.cmdAccRight[ind:] app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
update(app) update(app)
case "cmd-lowercase-word": case "cmd-lowercase-word":
if len(app.ui.cmdAccRight) == 0 { if len(app.ui.cmdAccRight) == 0 {
@ -1296,8 +1296,8 @@ func (e *callExpr) eval(app *app, args []string) {
return return
} }
ind := loc[0] + 1 ind := loc[0] + 1
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 = app.ui.cmdAccRight[ind:] app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
update(app) update(app)
case "cmd-transpose-word": case "cmd-transpose-word":
if len(app.ui.cmdAccLeft) == 0 { if len(app.ui.cmdAccLeft) == 0 {
@ -1313,8 +1313,8 @@ func (e *callExpr) eval(app *app, args []string) {
loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight)) loc := reWordEnd.FindStringIndex(string(app.ui.cmdAccRight))
if loc != nil { if loc != nil {
ind := loc[0] + 1 ind := loc[0] + 1
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, app.ui.cmdAccRight[:ind]...) app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(string(app.ui.cmdAccRight)[:ind])...)
app.ui.cmdAccRight = app.ui.cmdAccRight[ind:] app.ui.cmdAccRight = []rune(string(app.ui.cmdAccRight)[ind:])
} }
} }
@ -1325,11 +1325,11 @@ func (e *callExpr) eval(app *app, args []string) {
var acc []rune var acc []rune
acc = append(acc, app.ui.cmdAccLeft[:beg1]...) acc = append(acc, []rune(string(app.ui.cmdAccLeft)[:beg1])...)
acc = append(acc, app.ui.cmdAccLeft[beg2:end2]...) acc = append(acc, []rune(string(app.ui.cmdAccLeft)[beg2:end2])...)
acc = append(acc, app.ui.cmdAccLeft[end1:beg2]...) acc = append(acc, []rune(string(app.ui.cmdAccLeft)[end1:beg2])...)
acc = append(acc, app.ui.cmdAccLeft[beg1:end1]...) acc = append(acc, []rune(string(app.ui.cmdAccLeft)[beg1:end1])...)
acc = append(acc, app.ui.cmdAccLeft[end2:]...) acc = append(acc, []rune(string(app.ui.cmdAccLeft)[end2:])...)
app.ui.cmdAccLeft = acc app.ui.cmdAccLeft = acc
update(app) update(app)