"regexp"
"runtime"
"sort"
+ "strconv"
"time"
"github.com/go-errors/errors"
fmt.Println(" \tCleans the configuration directory")
fmt.Println("-config-dir dir")
fmt.Println(" \tSpecify a custom location for the configuration directory")
- fmt.Println("[FILE]:LINE:COL")
+ fmt.Println("[FILE]:LINE:COL (if the `parsecursor` option is enabled)")
fmt.Println("+LINE:COL")
fmt.Println(" \tSpecify a line and column to start the cursor at when opening a buffer")
fmt.Println("-options")
// LoadInput determines which files should be loaded into buffers
// based on the input stored in flag.Args()
-func LoadInput() []*buffer.Buffer {
+func LoadInput(args []string) []*buffer.Buffer {
// There are a number of ways micro should start given its input
// 1. If it is given a files in flag.Args(), it should open those
var filename string
var input []byte
var err error
- args := flag.Args()
buffers := make([]*buffer.Buffer, 0, len(args))
btype := buffer.BTDefault
}
files := make([]string, 0, len(args))
- flagStartPos := ""
- flagr := regexp.MustCompile(`^\+\d+(:\d+)?$`)
+ flagStartPos := buffer.Loc{-1, -1}
+ flagr := regexp.MustCompile(`^\+(\d+)(?::(\d+))?$`)
for _, a := range args {
- if flagr.MatchString(a) {
- flagStartPos = a[1:]
- } else {
- if flagStartPos != "" {
- files = append(files, a+":"+flagStartPos)
- flagStartPos = ""
- } else {
- files = append(files, a)
+ match := flagr.FindStringSubmatch(a)
+ if len(match) == 3 && match[2] != "" {
+ line, err := strconv.Atoi(match[1])
+ if err != nil {
+ screen.TermMessage(err)
+ continue
+ }
+ col, err := strconv.Atoi(match[2])
+ if err != nil {
+ screen.TermMessage(err)
+ continue
+ }
+ flagStartPos = buffer.Loc{col - 1, line - 1}
+ } else if len(match) == 3 && match[2] == "" {
+ line, err := strconv.Atoi(match[1])
+ if err != nil {
+ screen.TermMessage(err)
+ continue
}
+ flagStartPos = buffer.Loc{0, line - 1}
+ } else {
+ files = append(files, a)
}
}
// Option 1
// We go through each file and load it
for i := 0; i < len(files); i++ {
- buf, err := buffer.NewBufferFromFile(files[i], btype)
+ buf, err := buffer.NewBufferFromFileAtLoc(files[i], btype, flagStartPos)
if err != nil {
screen.TermMessage(err)
continue
screen.TermMessage("Error reading from stdin: ", err)
input = []byte{}
}
- buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, btype))
+ buffers = append(buffers, buffer.NewBufferFromStringAtLoc(string(input), filename, btype, flagStartPos))
} else {
// Option 3, just open an empty buffer
- buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, btype))
+ buffers = append(buffers, buffer.NewBufferFromStringAtLoc(string(input), filename, btype, flagStartPos))
}
return buffers
if err != nil {
screen.TermMessage(err)
}
- config.InitGlobalSettings()
+ err = config.InitGlobalSettings()
+ if err != nil {
+ screen.TermMessage(err)
+ }
// flag options
for k, v := range optionFlags {
DoPluginFlags()
- screen.Init()
+ err = screen.Init()
+ if err != nil {
+ fmt.Println(err)
+ fmt.Println("Fatal: Micro could not initialize a Screen.")
+ os.Exit(1)
+ }
defer func() {
if err := recover(); err != nil {
screen.TermMessage(err)
}
- b := LoadInput()
+ args := flag.Args()
+ b := LoadInput(args)
if len(b) == 0 {
// No buffers to open
case <-shell.CloseTerms:
case event = <-events:
case <-screen.DrawChan():
+ for len(screen.DrawChan()) > 0 {
+ <-screen.DrawChan()
+ }
}
if action.InfoBar.HasPrompt {