X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fcommand.go;h=976880d7a159922f9da08560c23e00eee19f03ad;hb=41a24e61d6b9017dbe010ae36295cb3c1dd701fc;hp=61f321ab56fca3e86871510ca342e3c44345f5e6;hpb=7f287b62fb59473228b6b5682da1451359993aa6;p=micro.git diff --git a/cmd/micro/command.go b/cmd/micro/command.go index 61f321ab..976880d7 100644 --- a/cmd/micro/command.go +++ b/cmd/micro/command.go @@ -1,16 +1,14 @@ package main import ( - "bytes" "fmt" "os" - "os/exec" - "os/signal" "path/filepath" "regexp" "runtime" "strconv" "strings" + "unicode/utf8" humanize "github.com/dustin/go-humanize" "github.com/zyedidia/micro/cmd/micro/shellwords" @@ -37,6 +35,7 @@ func init() { "Set": Set, "SetLocal": SetLocal, "Show": Show, + "ShowKey": ShowKey, "Run": Run, "Bind": Bind, "Quit": Quit, @@ -55,8 +54,10 @@ func init() { "Pwd": Pwd, "Open": Open, "TabSwitch": TabSwitch, + "Term": Term, "MemUsage": MemUsage, "Retab": Retab, + "Raw": Raw, } } @@ -93,6 +94,7 @@ func DefaultCommands() map[string]StrCommand { "set": {"Set", []Completion{OptionCompletion, OptionValueCompletion}}, "setlocal": {"SetLocal", []Completion{OptionCompletion, OptionValueCompletion}}, "show": {"Show", []Completion{OptionCompletion, NoCompletion}}, + "showkey": {"ShowKey", []Completion{NoCompletion}}, "bind": {"Bind", []Completion{NoCompletion}}, "run": {"Run", []Completion{NoCompletion}}, "quit": {"Quit", []Completion{NoCompletion}}, @@ -111,8 +113,32 @@ func DefaultCommands() map[string]StrCommand { "pwd": {"Pwd", []Completion{NoCompletion}}, "open": {"Open", []Completion{FileCompletion}}, "tabswitch": {"TabSwitch", []Completion{NoCompletion}}, + "term": {"Term", []Completion{NoCompletion}}, "memusage": {"MemUsage", []Completion{NoCompletion}}, "retab": {"Retab", []Completion{NoCompletion}}, + "raw": {"Raw", []Completion{NoCompletion}}, + } +} + +// CommandEditAction returns a bindable function that opens a prompt with +// the given string and executes the command when the user presses +// enter +func CommandEditAction(prompt string) func(*View, bool) bool { + return func(v *View, usePlugin bool) bool { + input, canceled := messenger.Prompt("> ", prompt, "Command", CommandCompletion) + if !canceled { + HandleCommand(input) + } + return false + } +} + +// CommandAction returns a bindable function which executes the +// given command +func CommandAction(cmd string) func(*View, bool) bool { + return func(v *View, usePlugin bool) bool { + HandleCommand(cmd) + return false } } @@ -151,7 +177,7 @@ func PluginCmd(args []string) { continue } } - if !IsSpaces(removed) { + if !IsSpaces([]byte(removed)) { messenger.Message("Removed ", removed) } else { messenger.Error("The requested plugins do not exist") @@ -199,10 +225,34 @@ func PluginCmd(args []string) { } } +// Retab changes all spaces to tabs or all tabs to spaces +// depending on the user's settings func Retab(args []string) { CurView().Retab(true) } +// Raw opens a new raw view which displays the escape sequences micro +// is receiving in real-time +func Raw(args []string) { + buf := NewBufferFromString("", "Raw events") + + view := NewView(buf) + view.Buf.Insert(view.Cursor.Loc, "Warning: Showing raw event escape codes\n") + view.Buf.Insert(view.Cursor.Loc, "Use CtrlQ to exit\n") + view.Type = vtRaw + tab := NewTabFromView(view) + tab.SetNum(len(tabs)) + tabs = append(tabs, tab) + curTab = len(tabs) - 1 + if len(tabs) == 2 { + for _, t := range tabs { + for _, v := range t.Views { + v.ToggleTabbar() + } + } + } +} + // TabSwitch switches to a given tab either by name or by number func TabSwitch(args []string) { if len(args) > 0 { @@ -212,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 @@ -243,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 } @@ -341,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) } @@ -370,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) } @@ -410,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)) @@ -435,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() } } @@ -489,6 +498,20 @@ func Show(args []string) { messenger.Message(option) } +// ShowKey displays the action that a key is bound to +func ShowKey(args []string) { + if len(args) < 1 { + messenger.Error("Please provide a key to show") + return + } + + if action, ok := bindingsStr[args[0]]; ok { + messenger.Message(action) + } else { + messenger.Message(args[0], " has no binding") + } +} + // Bind creates a new keybinding func Bind(args []string) { if len(args) < 2 { @@ -552,6 +575,7 @@ func Replace(args []string) { } replace := string(args[1]) + replaceBytes := []byte(replace) regex, err := regexp.Compile("(?m)" + search) if err != nil { @@ -565,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) } @@ -644,94 +661,17 @@ func ReplaceAll(args []string) { Replace(append(args, "-a")) } -// RunShellCommand executes a shell command and returns the output/error -func RunShellCommand(input string) (string, error) { - args, err := shellwords.Split(input) - if err != nil { - return "", err +// Term opens a terminal in the current view +func Term(args []string) { + var err error + if len(args) == 0 { + err = CurView().StartTerminal([]string{os.Getenv("SHELL"), "-i"}, true, false, "") + } else { + err = CurView().StartTerminal(args, true, false, "") } - inputCmd := args[0] - - cmd := exec.Command(inputCmd, args[1:]...) - outputBytes := &bytes.Buffer{} - cmd.Stdout = outputBytes - cmd.Stderr = outputBytes - cmd.Start() - err = cmd.Wait() // wait for command to finish - outstring := outputBytes.String() - return outstring, err -} - -// HandleShellCommand runs the shell command -// The openTerm argument specifies whether a terminal should be opened (for viewing output -// or interacting with stdin) -func HandleShellCommand(input string, openTerm bool, waitToFinish bool) string { - args, err := shellwords.Split(input) if err != nil { - return "" - } - inputCmd := args[0] - if !openTerm { - // Simply run the command in the background and notify the user when it's done - messenger.Message("Running...") - go func() { - output, err := RunShellCommand(input) - totalLines := strings.Split(output, "\n") - - if len(totalLines) < 3 { - if err == nil { - messenger.Message(inputCmd, " exited without error") - } else { - messenger.Message(inputCmd, " exited with error: ", err, ": ", output) - } - } else { - messenger.Message(output) - } - // We have to make sure to redraw - RedrawAll() - }() - } else { - // Shut down the screen because we're going to interact directly with the shell - screen.Fini() - screen = nil - - args := args[1:] - - // Set up everything for the command - var output string - cmd := exec.Command(inputCmd, args...) - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - // This is a trap for Ctrl-C so that it doesn't kill micro - // Instead we trap Ctrl-C to kill the program we're running - c := make(chan os.Signal, 1) - signal.Notify(c, os.Interrupt) - go func() { - for range c { - cmd.Process.Kill() - } - }() - - cmd.Start() - err := cmd.Wait() - - if err != nil { - output = err.Error() - } - - if waitToFinish { - // This is just so we don't return right away and let the user press enter to return - TermMessage("") - } - - // Start the screen back up - InitScreen() - - return output + messenger.Error(err) } - return "" } // HandleCommand handles input from the user