Merge pull request #1135 from whilei/gofmt-2018-Jun-17-00-39

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

diff --git a/cmd/micro/command.go b/cmd/micro/command.go
index ebb7936551d82353829d5c5fdbed19fe892d9510..976880d7a159922f9da08560c23e00eee19f03ad 100644 (file)
--- a/cmd/micro/command.go
+++ b/cmd/micro/command.go
@@ -8,6 +8,7 @@ import (
        "runtime"
        "strconv"
        "strings"
+       "unicode/utf8"
 
        humanize "github.com/dustin/go-humanize"
        "github.com/zyedidia/micro/cmd/micro/shellwords"
@@ -245,7 +246,7 @@ func Raw(args []string) {
        curTab = len(tabs) - 1
        if len(tabs) == 2 {
                for _, t := range tabs {
-                       for _, v := range t.views {
+                       for _, v := range t.Views {
                                v.ToggleTabbar()
                        }
                }
@@ -261,7 +262,7 @@ func TabSwitch(args []string) {
 
                        found := false
                        for _, t := range tabs {
-                               v := t.views[t.CurView]
+                               v := t.Views[t.CurView]
                                if v.Buf.GetName() == args[0] {
                                        curTab = v.TabNum
                                        found = true
@@ -292,7 +293,7 @@ func Cd(args []string) {
                }
                wd, _ := os.Getwd()
                for _, tab := range tabs {
-                       for _, view := range tab.views {
+                       for _, view := range tab.Views {
                                if len(view.Buf.name) == 0 {
                                        continue
                                }
@@ -390,24 +391,10 @@ func VSplit(args []string) {
        if len(args) == 0 {
                CurView().VSplit(NewBufferFromString("", ""))
        } else {
-               filename := args[0]
-               filename = ReplaceHome(filename)
-               file, err := os.Open(filename)
-               fileInfo, _ := os.Stat(filename)
-
-               if err == nil && fileInfo.IsDir() {
-                       messenger.Error(filename, " is a directory")
-                       return
-               }
-
-               defer file.Close()
-
-               var buf *Buffer
+               buf, err := NewBufferFromFile(args[0])
                if err != nil {
-                       // File does not exist -- create an empty buffer with that name
-                       buf = NewBufferFromString("", filename)
-               } else {
-                       buf = NewBuffer(file, FSize(file), filename)
+                       messenger.Error(err)
+                       return
                }
                CurView().VSplit(buf)
        }
@@ -419,24 +406,10 @@ func HSplit(args []string) {
        if len(args) == 0 {
                CurView().HSplit(NewBufferFromString("", ""))
        } else {
-               filename := args[0]
-               filename = ReplaceHome(filename)
-               file, err := os.Open(filename)
-               fileInfo, _ := os.Stat(filename)
-
-               if err == nil && fileInfo.IsDir() {
-                       messenger.Error(filename, " is a directory")
-                       return
-               }
-
-               defer file.Close()
-
-               var buf *Buffer
+               buf, err := NewBufferFromFile(args[0])
                if err != nil {
-                       // File does not exist -- create an empty buffer with that name
-                       buf = NewBufferFromString("", filename)
-               } else {
-                       buf = NewBuffer(file, FSize(file), filename)
+                       messenger.Error(err)
+                       return
                }
                CurView().HSplit(buf)
        }
@@ -459,23 +432,10 @@ func NewTab(args []string) {
        if len(args) == 0 {
                CurView().AddTab(true)
        } else {
-               filename := args[0]
-               filename = ReplaceHome(filename)
-               file, err := os.Open(filename)
-               fileInfo, _ := os.Stat(filename)
-
-               if err == nil && fileInfo.IsDir() {
-                       messenger.Error(filename, " is a directory")
-                       return
-               }
-
-               defer file.Close()
-
-               var buf *Buffer
+               buf, err := NewBufferFromFile(args[0])
                if err != nil {
-                       buf = NewBufferFromString("", filename)
-               } else {
-                       buf = NewBuffer(file, FSize(file), filename)
+                       messenger.Error(err)
+                       return
                }
 
                tab := NewTabFromView(NewView(buf))
@@ -484,7 +444,7 @@ func NewTab(args []string) {
                curTab = len(tabs) - 1
                if len(tabs) == 2 {
                        for _, t := range tabs {
-                               for _, v := range t.views {
+                               for _, v := range t.Views {
                                        v.ToggleTabbar()
                                }
                        }
@@ -615,6 +575,7 @@ func Replace(args []string) {
        }
 
        replace := string(args[1])
+       replaceBytes := []byte(replace)
 
        regex, err := regexp.Compile("(?m)" + search)
        if err != nil {
@@ -628,23 +589,16 @@ func Replace(args []string) {
        found := 0
        replaceAll := func() {
                var deltas []Delta
-               deltaXOffset := Count(replace) - Count(search)
                for i := 0; i < view.Buf.LinesNum(); i++ {
-                       matches := regex.FindAllIndex(view.Buf.lines[i].data, -1)
-                       str := string(view.Buf.lines[i].data)
-
-                       if matches != nil {
-                               xOffset := 0
-                               for _, m := range matches {
-                                       from := Loc{runePos(m[0], str) + xOffset, i}
-                                       to := Loc{runePos(m[1], str) + xOffset, i}
+                       newText := regex.ReplaceAllFunc(view.Buf.lines[i].data, func(in []byte) []byte {
+                               found++
+                               return replaceBytes
+                       })
 
-                                       xOffset += deltaXOffset
+                       from := Loc{0, i}
+                       to := Loc{utf8.RuneCount(view.Buf.lines[i].data), i}
 
-                                       deltas = append(deltas, Delta{replace, from, to})
-                                       found++
-                               }
-                       }
+                       deltas = append(deltas, Delta{string(newText), from, to})
                }
                view.Buf.MultipleReplace(deltas)
        }