github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-17 22:37:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix diff remove problem in ApplyDiff

Browse Source 
The location counter was being updated when there was a removal in
the text but it shouldn't be.

Fixes #163
This commit is contained in:
Zachary Yedidia
2016-06-11 11:23:05 -04:00
parent cdfea45a49
commit 553b3d80c4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/micro/eventhandler.go
View File

@@ -66,12 +66,14 @@ func (eh *EventHandler) ApplyDiff(new string) {
diff := differ.DiffMain(eh.buf.String(), new, false)
loc := eh.buf.Start()
for _, d := range diff {
if d.Type == dmp.DiffInsert {
eh.Insert(loc, d.Text)
} else if d.Type == dmp.DiffDelete {
if d.Type == dmp.DiffDelete {
eh.Remove(loc, loc.Move(Count(d.Text), eh.buf))
} else {
if d.Type == dmp.DiffInsert {
eh.Insert(loc, d.Text)
}
loc = loc.Move(Count(d.Text), eh.buf)
}
loc = loc.Move(Count(d.Text), eh.buf)
}
}