NeonXP/micro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More fixes to search and replace

Browse source
This commit is contained in:
Zachary Yedidia 2016-10-13 20:47:33 -04:00
parent d3c5e3ab47
commit 4db7f33eaf
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/micro/command.go
View file

@ -419,23 +419,22 @@ func Replace(args []string) {
if matches != nil && len(matches) > 0 {
prevMatchCount := runePos(matches[0][0], bufStr)
searchCount := runePos(matches[0][1], bufStr) - prevMatchCount
adjust := 0
prevMatch := matches[0]
from := FromCharPos(prevMatch[0], view.Buf)
to := from.Move(searchCount, view.Buf)
adjust += Count(replace) - searchCount
adjust := Count(replace) - searchCount
view.Buf.Replace(from, to, replace)
if len(matches) > 1 {
for _, match := range matches[1:] {
found++
matchCount := runePos(match[0], bufStr)
searchCount = runePos(match[1], bufStr) - matchCount
from = from.Move(matchCount-prevMatchCount+adjust, view.Buf)
to := from.Move(searchCount, view.Buf)
// TermMessage(match[0], " ", prevMatch[0], " ", adjust, "\n", from, " ", to)
to = from.Move(searchCount, view.Buf)
view.Buf.Replace(from, to, replace)
prevMatch = match
prevMatchCount = matchCount
// adjust += Count(replace) - searchCount
adjust = Count(replace) - searchCount
}
}
}