Fix current line display, automatic formatting fixes

editor/document.go

@@ -8,7 +8,7 @@ import (
 
 type document struct {
 	filename string
-	rows []*row
+	rows     []*row
 }
 
 func newDocument() *document {

editor/draw.go

@@ -126,7 +126,7 @@ func (e *editor) drawStatusBar(ab *buffer) {
 		return
 	}
 
-	rightStatus := fmt.Sprintf("%d/%d", e.cursor.y, e.document.rowCount())
+	rightStatus := fmt.Sprintf("%d/%d", e.cursor.y+1, e.document.rowCount())
 	rlength := len(rightStatus)
 	statusLength := length + rlength
 

editor/editor.go

@@ -22,12 +22,12 @@ type statusMsg struct {
 }
 
 type editor struct {
-	screen *terminal.Screen
+	screen   *terminal.Screen
-	cursor *point
+	cursor   *point
-	offset *point
+	offset   *point
 	document *document
-	status *statusMsg
+	status   *statusMsg
-	renderX int
+	renderX  int
 }
 
 func New() *editor {

editor/keymap.go

@@ -5,13 +5,13 @@ package editor
 // ----------------------------------------------------------------------------
 
 const (
-	keyUp = "ARROW_UP"
+	keyUp       = "ARROW_UP"
-	keyDown = "ARROW_DOWN"
+	keyDown     = "ARROW_DOWN"
-	keyLeft = "ARROW_LEFT"
+	keyLeft     = "ARROW_LEFT"
-	keyRight = "ARROW_RIGHT"
+	keyRight    = "ARROW_RIGHT"
-	keyPageUp = "PAGE_UP"
+	keyPageUp   = "PAGE_UP"
 	keyPageDown = "PAGE_DOWN"
-	keyHome = "HOME"
+	keyHome     = "HOME"
-	keyEnd = "END"
+	keyEnd      = "END"
-	keyDelete = "DELETE"
+	keyDelete   = "DELETE"
 )

editor/row.go

@@ -5,7 +5,7 @@ import (
 )
 
 type row struct {
-	chars []rune
+	chars  []rune
 	render []rune
 }
 

editor/row_test.go

@@ -41,8 +41,8 @@ func TestRenderSize(t *testing.T) {
 
 type insertRune struct {
 	initial string
-	ch rune
+	ch      rune
-	at int
+	at      int
 }
 
 var insertRuneTests = []insertRune{

key/key_test.go

@@ -3,7 +3,7 @@ package key
 import "testing"
 
 type isRune struct {
-	arg1 rune
+	arg1     rune
 	expected bool
 }
 

terminal/ansi.go

@@ -32,7 +32,7 @@ const (
 // Color sequences
 const (
 	InvertColor = EscPrefix + "7m"
-	ResetColor = EscPrefix + "m"
+	ResetColor  = EscPrefix + "m"
 )
 
 // ----------------------------------------------------------------------------