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

Fix buffer.RuneAt (#1895)

Browse Source 
Fix buffer.RuneAt returning the rune not at the given location (as the
documentation claims) but just before it.
This commit is contained in:
Dmitry Maluka
2020-10-20 02:36:14 +02:00
committed by GitHub
parent 23162f7a34
commit 298fa40f90
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/buffer/autocomplete.go
View File

@@ -69,11 +69,11 @@ func GetWord(b *Buffer) ([]byte, int) {
l := b.LineBytes(c.Y)
l = util.SliceStart(l, c.X)
if c.X == 0 || util.IsWhitespace(b.RuneAt(c.Loc)) {
if c.X == 0 || util.IsWhitespace(b.RuneAt(c.Loc.Move(-1, b))) {
return []byte{}, -1
}
if util.IsNonAlphaNumeric(b.RuneAt(c.Loc)) {
if util.IsNonAlphaNumeric(b.RuneAt(c.Loc.Move(-1, b))) {
return []byte{}, c.X
}

3
internal/buffer/buffer.go
View File

@@ -511,11 +511,12 @@ func (b *Buffer) RuneAt(loc Loc) rune {
for len(line) > 0 {
r, _, size := util.DecodeCharacter(line)
line = line[size:]
i++
if i == loc.X {
return r
}
i++
}
}
return '\n'

2
internal/buffer/save.go
View File

@@ -109,7 +109,7 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
if b.Settings["eofnewline"].(bool) {
end := b.End()
if b.RuneAt(Loc{end.X, end.Y}) != '\n' {
if b.RuneAt(Loc{end.X - 1, end.Y}) != '\n' {
b.insert(end, []byte{'\n'})
}
}