Merge pull request #233 from schollz/master

[micro.git] / cmd / micro / buffer.go

diff --git a/cmd/micro/buffer.go b/cmd/micro/buffer.go
index 3f7e2e618243ff465959bf7ff55dcbf98b892398..935fe3e91333a1228763f7fcc7e72f201390eab1 100644 (file)
--- a/cmd/micro/buffer.go
+++ b/cmd/micro/buffer.go
@@ -8,6 +8,8 @@ import (
        "os/exec"
        "os/signal"
        "path/filepath"
+       "strconv"
+       "strings"
        "time"
        "unicode/utf8"
 )
@@ -85,10 +87,36 @@ func NewBuffer(txt []byte, path string) *Buffer {
        }
 
        // Put the cursor at the first spot
+       cursorStartX := 0
+       cursorStartY := 0
+       // If +LINE,COL was passed, use start position LINE,COL
+       if len(flagLineColumn) > 0 {
+               positions := strings.Split(flagLineColumn[1:], ",")
+               if len(positions) == 2 {
+                       lineNum, errPos1 := strconv.Atoi(positions[0])
+                       colNum, errPos2 := strconv.Atoi(positions[1])
+                       if errPos1 == nil && errPos2 == nil {
+                               cursorStartX = colNum
+                               cursorStartY = lineNum - 1
+                               // Check to avoid line overflow
+                               if cursorStartY > b.NumLines {
+                                       cursorStartY = b.NumLines - 1
+                               } else if cursorStartY < 0 {
+                                       cursorStartY = 0
+                               }
+                               // Check to avoid column overflow
+                               if cursorStartX > len(b.Line(cursorStartY)) {
+                                       cursorStartX = len(b.Line(cursorStartY))
+                               } else if cursorStartX < 0 {
+                                       cursorStartX = 0
+                               }
+                       }
+               }
+       }
        b.Cursor = Cursor{
                Loc: Loc{
-                       X: 0,
-                       Y: 0,
+                       X: cursorStartX,
+                       Y: cursorStartY,
                },
                buf: b,
        }