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

Minor cleanup

Browse source
This commit is contained in:
Zachary Yedidia 2016-04-26 20:18:56 -04:00
parent 6d2845ca35
commit 8e03e20055
2 changed files with 82 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
cmd/micro/bindings.go
View file

@ -54,7 +54,7 @@ func InitBindings() {
"Paste": (*View).Paste,
"SelectAll": (*View).SelectAll,
"OpenFile": (*View).OpenFile,
"Beginning": (*View).Beginning,
"Start": (*View).Start,
"End": (*View).End,
"PageUp": (*View).PageUp,
"PageDown": (*View).PageDown,
@ -276,7 +276,7 @@ func DefaultBindings() map[string]string {
"CtrlK": "CutLine",
"CtrlV": "Paste",
"CtrlA": "SelectAll",
"Home": "Beginning",
"Home": "Start",
"End": "End",
"PgUp": "PageUp",
"PgDn": "PageDown",
@ -323,16 +323,19 @@ func (v *View) CursorRight() bool {
return true
}
// WordRight moves the cursor one word to the right
func (v *View) WordRight() bool {
v.cursor.WordRight()
return true
}
// WordLeft moves the cursor one word to the left
func (v *View) WordLeft() bool {
v.cursor.WordLeft()
return true
}
// SelectLeft selects the character to the left of the cursor
func (v *View) SelectLeft() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
@ -343,6 +346,7 @@ func (v *View) SelectLeft() bool {
return true
}
// SelectRight selects the character to the right of the cursor
func (v *View) SelectRight() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
@ -353,6 +357,7 @@ func (v *View) SelectRight() bool {
return true
}
// SelectWordRight selects the word to the right of the cursor
func (v *View) SelectWordRight() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
@ -363,6 +368,7 @@ func (v *View) SelectWordRight() bool {
return true
}
// SelectWordLeft selects the word to the left of the cursor
func (v *View) SelectWordLeft() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
@ -373,6 +379,75 @@ func (v *View) SelectWordLeft() bool {
return true
}
// StartOfLine moves the cursor to the start of the line
func (v *View) StartOfLine() bool {
v.cursor.Start()
return true
}
// EndOfLine moves the cursor to the end of the line
func (v *View) EndOfLine() bool {
v.cursor.End()
return true
}
// SelectToStartOfLine selects to the start of the current line
func (v *View) SelectToStartOfLine() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.cursor.Start()
v.cursor.SelectTo(v.cursor.Loc())
return true
}
// SelectToEndOfLine selects to the end of the current line
func (v *View) SelectToEndOfLine() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.cursor.End()
v.cursor.SelectTo(v.cursor.Loc())
return true
}
// CursorStart moves the cursor to the start of the buffer
func (v *View) CursorStart() bool {
v.cursor.x = 0
v.cursor.y = 0
return true
}
// CursorEnd moves the cursor to the end of the buffer
func (v *View) CursorEnd() bool {
v.cursor.SetLoc(len(v.buf.text))
return true
}
// SelectToStart selects the text from the cursor to the start of the buffer
func (v *View) SelectToStart() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.CursorStart()
v.cursor.SelectTo(0)
return true
}
// SelectToEnd selects the text from the cursor to the end of the buffer
func (v *View) SelectToEnd() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.CursorEnd()
v.cursor.SelectTo(len(v.buf.text))
return true
}
// InsertSpace inserts a space
func (v *View) InsertSpace() bool {
// Insert a space
@ -663,8 +738,8 @@ func (v *View) OpenFile() bool {
return true
}
// Beginning moves the viewport to the start of the buffer
func (v *View) Beginning() bool {
// Start moves the viewport to the start of the buffer
func (v *View) Start() bool {
v.topline = 0
return false
}
@ -731,69 +806,6 @@ func (v *View) ToggleRuler() bool {
return false
}
// StartOfLine moves the cursor to the start of the line
func (v *View) StartOfLine() bool {
v.cursor.Start()
return true
}
// EndOfLine moves the cursor to the end of the line
func (v *View) EndOfLine() bool {
v.cursor.End()
return true
}
func (v *View) SelectToStartOfLine() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.cursor.Start()
v.cursor.SelectTo(v.cursor.Loc())
return true
}
func (v *View) SelectToEndOfLine() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.cursor.End()
v.cursor.SelectTo(v.cursor.Loc())
return true
}
func (v *View) CursorStart() bool {
v.cursor.x = 0
v.cursor.y = 0
return true
}
func (v *View) CursorEnd() bool {
v.cursor.SetLoc(len(v.buf.text))
return true
}
func (v *View) SelectToStart() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.CursorStart()
v.cursor.SelectTo(0)
return true
}
func (v *View) SelectToEnd() bool {
loc := v.cursor.Loc()
if !v.cursor.HasSelection() {
v.cursor.origSelection[0] = loc
}
v.CursorEnd()
v.cursor.SelectTo(len(v.buf.text))
return true
}
// None is no action
func None() bool {
return false

3
cmd/micro/cursor.go
View file

@ -204,6 +204,7 @@ func (c *Cursor) AddWordToSelection() {
}
}
// SelectTo selects from the current cursor location to the given location
func (c *Cursor) SelectTo(loc int) {
if loc > c.origSelection[0] {
c.curSelection[0] = c.origSelection[0]
@ -214,6 +215,7 @@ func (c *Cursor) SelectTo(loc int) {
}
}
// WordRight moves the cursor one word to the right
func (c *Cursor) WordRight() {
c.Right()
for !IsWordChar(string(c.RuneUnder(c.x))) {
@ -224,6 +226,7 @@ func (c *Cursor) WordRight() {
}
}
// WordLeft moves the cursor one word to the left
func (c *Cursor) WordLeft() {
c.Left()
for !IsWordChar(string(c.RuneUnder(c.x))) {