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

Improve cursor word movement

Browse Source 
The definition of a "word" is a bit more subtle now. Before it would
just move the cursor until a whitespace was found. Now it will stop
at non word characters as well.
This commit is contained in:
Zachary Yedidia
2016-08-20 12:26:54 -07:00
parent 9db4e640a0
commit 198b1b8e79
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/micro/cursor.go
View File

@@ -167,14 +167,15 @@ func (c *Cursor) SelectTo(loc Loc) {
// WordRight moves the cursor one word to the right
func (c *Cursor) WordRight() {
c.Right()
for IsWhitespace(c.RuneUnder(c.X)) {
if c.X == Count(c.buf.Line(c.Y)) {
c.Right()
return
}
c.Right()
}
for !IsWhitespace(c.RuneUnder(c.X)) {
c.Right()
for IsWordChar(string(c.RuneUnder(c.X))) {
if c.X == Count(c.buf.Line(c.Y)) {
return
}
@@ -184,20 +185,20 @@ func (c *Cursor) WordRight() {
// WordLeft moves the cursor one word to the left
func (c *Cursor) WordLeft() {
c.Left()
for IsWhitespace(c.RuneUnder(c.X)) {
if c.X == 0 {
c.Left()
return
}
c.Left()
}
for !IsWhitespace(c.RuneUnder(c.X)) {
c.Left()
for IsWordChar(string(c.RuneUnder(c.X))) {
if c.X == 0 {
return
}
c.Left()
}
c.Right()
}
// RuneUnder returns the rune under the given x position