X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fcommand.go;h=b36df74bd46cfcfc4b2a5f961778f62b9fd75fef;hb=3ecdd96931ac75039105b5a4ac2fdd3b5526dbf6;hp=61ba4330e4d949ce1c5811366365dbb968186658;hpb=261748bd56bc7e358fe57cb4644fee1f9594f7a5;p=micro.git

diff --git a/cmd/micro/command.go b/cmd/micro/command.go
index 61ba4330..b36df74b 100644
--- a/cmd/micro/command.go
+++ b/cmd/micro/command.go
@@ -2,10 +2,13 @@ package main
 
 import (
 	"bytes"
+	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/signal"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -24,18 +27,29 @@ type StrCommand struct {
 
 var commands map[string]Command
 
-var commandActions = map[string]func([]string){
-	"Set":      Set,
-	"SetLocal": SetLocal,
-	"Run":      Run,
-	"Bind":     Bind,
-	"Quit":     Quit,
-	"Save":     Save,
-	"Replace":  Replace,
-	"VSplit":   VSplit,
-	"HSplit":   HSplit,
-	"Tab":      NewTab,
-	"Help":     Help,
+var commandActions map[string]func([]string)
+
+func init() {
+	commandActions = map[string]func([]string){
+		"Set":       Set,
+		"SetLocal":  SetLocal,
+		"Show":      Show,
+		"Run":       Run,
+		"Bind":      Bind,
+		"Quit":      Quit,
+		"Save":      Save,
+		"Replace":   Replace,
+		"VSplit":    VSplit,
+		"HSplit":    HSplit,
+		"Tab":       NewTab,
+		"Help":      Help,
+		"Eval":      Eval,
+		"ToggleLog": ToggleLog,
+		"Plugin":    PluginCmd,
+		"Reload":    Reload,
+		"Cd":        Cd,
+		"Pwd":       Pwd,
+	}
 }
 
 // InitCommands initializes the default commands
@@ -68,20 +82,157 @@ func MakeCommand(name, function string, completions ...Completion) {
 // DefaultCommands returns a map containing micro's default commands
 func DefaultCommands() map[string]StrCommand {
 	return map[string]StrCommand{
-		"set":      StrCommand{"Set", []Completion{OptionCompletion, NoCompletion}},
-		"setlocal": StrCommand{"SetLocal", []Completion{OptionCompletion, NoCompletion}},
-		"bind":     StrCommand{"Bind", []Completion{NoCompletion}},
-		"run":      StrCommand{"Run", []Completion{NoCompletion}},
-		"quit":     StrCommand{"Quit", []Completion{NoCompletion}},
-		"save":     StrCommand{"Save", []Completion{NoCompletion}},
-		"replace":  StrCommand{"Replace", []Completion{NoCompletion}},
-		"vsplit":   StrCommand{"VSplit", []Completion{FileCompletion, NoCompletion}},
-		"hsplit":   StrCommand{"HSplit", []Completion{FileCompletion, NoCompletion}},
-		"tab":      StrCommand{"Tab", []Completion{FileCompletion, NoCompletion}},
-		"help":     StrCommand{"Help", []Completion{HelpCompletion, NoCompletion}},
+		"set":      {"Set", []Completion{OptionCompletion, NoCompletion}},
+		"setlocal": {"SetLocal", []Completion{OptionCompletion, NoCompletion}},
+		"show":     {"Show", []Completion{OptionCompletion, NoCompletion}},
+		"bind":     {"Bind", []Completion{NoCompletion}},
+		"run":      {"Run", []Completion{NoCompletion}},
+		"quit":     {"Quit", []Completion{NoCompletion}},
+		"save":     {"Save", []Completion{NoCompletion}},
+		"replace":  {"Replace", []Completion{NoCompletion}},
+		"vsplit":   {"VSplit", []Completion{FileCompletion, NoCompletion}},
+		"hsplit":   {"HSplit", []Completion{FileCompletion, NoCompletion}},
+		"tab":      {"Tab", []Completion{FileCompletion, NoCompletion}},
+		"help":     {"Help", []Completion{HelpCompletion, NoCompletion}},
+		"eval":     {"Eval", []Completion{NoCompletion}},
+		"log":      {"ToggleLog", []Completion{NoCompletion}},
+		"plugin":   {"Plugin", []Completion{PluginCmdCompletion, PluginNameCompletion}},
+		"reload":   {"Reload", []Completion{NoCompletion}},
+		"cd":       {"Cd", []Completion{FileCompletion}},
+		"pwd":      {"Pwd", []Completion{NoCompletion}},
+	}
+}
+
+// PluginCmd installs, removes, updates, lists, or searches for given plugins
+func PluginCmd(args []string) {
+	if len(args) >= 1 {
+		switch args[0] {
+		case "install":
+			installedVersions := GetInstalledVersions(false)
+			for _, plugin := range args[1:] {
+				pp := GetAllPluginPackages().Get(plugin)
+				if pp == nil {
+					messenger.Error("Unknown plugin \"" + plugin + "\"")
+				} else if err := pp.IsInstallable(); err != nil {
+					messenger.Error("Error installing ", plugin, ": ", err)
+				} else {
+					for _, installed := range installedVersions {
+						if pp.Name == installed.pack.Name {
+							if pp.Versions[0].Version.Compare(installed.Version) == 1 {
+								messenger.Error(pp.Name, " is already installed but out-of-date: use 'plugin update ", pp.Name, "' to update")
+							} else {
+								messenger.Error(pp.Name, " is already installed")
+							}
+						}
+					}
+					pp.Install()
+				}
+			}
+		case "remove":
+			removed := ""
+			for _, plugin := range args[1:] {
+				// check if the plugin exists.
+				for _, lp := range loadedPlugins {
+					if lp == plugin {
+						UninstallPlugin(plugin)
+						removed += plugin + " "
+						continue
+					}
+				}
+			}
+			if !IsSpaces(removed) {
+				messenger.Message("Removed ", removed)
+			} else {
+				messenger.Error("The requested plugins do not exist")
+			}
+		case "update":
+			UpdatePlugins(args[1:])
+		case "list":
+			plugins := GetInstalledVersions(false)
+			messenger.AddLog("----------------")
+			messenger.AddLog("The following plugins are currently installed:\n")
+			for _, p := range plugins {
+				messenger.AddLog(fmt.Sprintf("%s (%s)", p.pack.Name, p.Version))
+			}
+			messenger.AddLog("----------------")
+			if len(plugins) > 0 {
+				if CurView().Type != vtLog {
+					ToggleLog([]string{})
+				}
+			}
+		case "search":
+			plugins := SearchPlugin(args[1:])
+			messenger.Message(len(plugins), " plugins found")
+			for _, p := range plugins {
+				messenger.AddLog("----------------")
+				messenger.AddLog(p.String())
+			}
+			messenger.AddLog("----------------")
+			if len(plugins) > 0 {
+				if CurView().Type != vtLog {
+					ToggleLog([]string{})
+				}
+			}
+		case "available":
+			packages := GetAllPluginPackages()
+			messenger.AddLog("Available Plugins:")
+			for _, pkg := range packages {
+				messenger.AddLog(pkg.Name)
+			}
+			if CurView().Type != vtLog {
+				ToggleLog([]string{})
+			}
+		}
+	} else {
+		messenger.Error("Not enough arguments")
+	}
+}
+
+func Cd(args []string) {
+	if len(args) > 0 {
+		home, _ := homedir.Dir()
+		path := strings.Replace(args[0], "~", home, 1)
+		os.Chdir(path)
+		for _, tab := range tabs {
+			for _, view := range tab.views {
+				wd, _ := os.Getwd()
+				view.Buf.Path, _ = MakeRelative(view.Buf.AbsPath, wd)
+				if p, _ := filepath.Abs(view.Buf.Path); !strings.Contains(p, wd) {
+					view.Buf.Path = view.Buf.AbsPath
+				}
+			}
+		}
+	}
+}
+
+func Pwd(args []string) {
+	wd, err := os.Getwd()
+	if err != nil {
+		messenger.Message(err.Error())
+	} else {
+		messenger.Message(wd)
+	}
+}
+
+func ToggleLog(args []string) {
+	buffer := messenger.getBuffer()
+	if CurView().Type != vtLog {
+		CurView().HSplit(buffer)
+		CurView().Type = vtLog
+		RedrawAll()
+		buffer.Cursor.Loc = buffer.Start()
+		CurView().Relocate()
+		buffer.Cursor.Loc = buffer.End()
+		CurView().Relocate()
+	} else {
+		CurView().Quit(true)
 	}
 }
 
+func Reload(args []string) {
+	LoadAll()
+}
+
 // Help tries to open the given help page in a horizontal split
 func Help(args []string) {
 	if len(args) < 1 {
@@ -89,7 +240,7 @@ func Help(args []string) {
 		CurView().openHelp("help")
 	} else {
 		helpPage := args[0]
-		if _, ok := helpPages[helpPage]; ok {
+		if FindRuntimeFile(RTHelp, helpPage) != nil {
 			CurView().openHelp(helpPage)
 		} else {
 			messenger.Error("Sorry, no help for ", helpPage)
@@ -141,6 +292,18 @@ func HSplit(args []string) {
 	}
 }
 
+// Eval evaluates a lua expression
+func Eval(args []string) {
+	if len(args) >= 1 {
+		err := L.DoString(args[0])
+		if err != nil {
+			messenger.Error(err)
+		}
+	} else {
+		messenger.Error("Not enough arguments")
+	}
+}
+
 // NewTab opens the given file in a new tab
 func NewTab(args []string) {
 	if len(args) == 0 {
@@ -168,6 +331,7 @@ func NewTab(args []string) {
 // Set sets an option
 func Set(args []string) {
 	if len(args) < 2 {
+		messenger.Error("Not enough arguments")
 		return
 	}
 
@@ -177,21 +341,43 @@ func Set(args []string) {
 	SetOptionAndSettings(option, value)
 }
 
+// SetLocal sets an option local to the buffer
 func SetLocal(args []string) {
 	if len(args) < 2 {
+		messenger.Error("Not enough arguments")
 		return
 	}
 
 	option := strings.TrimSpace(args[0])
 	value := strings.TrimSpace(args[1])
 
-	SetLocalOption(option, value, CurView())
+	err := SetLocalOption(option, value, CurView())
+	if err != nil {
+		messenger.Error(err.Error())
+	}
+}
+
+// Show shows the value of the given option
+func Show(args []string) {
+	if len(args) < 1 {
+		messenger.Error("Please provide an option to show")
+		return
+	}
+
+	option := GetOption(args[0])
+
+	if option == nil {
+		messenger.Error(args[0], " is not a valid option")
+		return
+	}
+
+	messenger.Message(option)
 }
 
 // Bind creates a new keybinding
 func Bind(args []string) {
-	if len(args) != 2 {
-		messenger.Error("Incorrect number of arguments")
+	if len(args) < 2 {
+		messenger.Error("Not enough arguments")
 		return
 	}
 	BindKey(args[0], args[1])
@@ -200,7 +386,7 @@ func Bind(args []string) {
 // Run runs a shell command in the background
 func Run(args []string) {
 	// Run a shell command in the background (openTerm is false)
-	HandleShellCommand(strings.Join(args, " "), false)
+	HandleShellCommand(JoinCommandArgs(args...), false, true)
 }
 
 // Quit closes the main view
@@ -211,48 +397,32 @@ func Quit(args []string) {
 
 // Save saves the buffer in the main view
 func Save(args []string) {
-	// Save the main view
-	CurView().Save(true)
+	if len(args) == 0 {
+		// Save the main view
+		CurView().Save(true)
+	} else {
+		CurView().Buf.SaveAs(args[0])
+	}
 }
 
 // Replace runs search and replace
 func Replace(args []string) {
-	// This is a regex to parse the replace expression
-	// We allow no quotes if there are no spaces, but if you want to search
-	// for or replace an expression with spaces, you can add double quotes
-	r := regexp.MustCompile(`"[^"\\]*(?:\\.[^"\\]*)*"|[^\s]*`)
-	replaceCmd := r.FindAllString(strings.Join(args, " "), -1)
-	if len(replaceCmd) < 2 {
+	if len(args) < 2 {
 		// We need to find both a search and replace expression
 		messenger.Error("Invalid replace statement: " + strings.Join(args, " "))
 		return
 	}
 
 	var flags string
-	if len(replaceCmd) == 3 {
+	if len(args) == 3 {
 		// The user included some flags
-		flags = replaceCmd[2]
-	}
-
-	search := string(replaceCmd[0])
-	replace := string(replaceCmd[1])
-
-	// If the search and replace expressions have quotes, we need to remove those
-	if strings.HasPrefix(search, `"`) && strings.HasSuffix(search, `"`) {
-		search = search[1 : len(search)-1]
-	}
-	if strings.HasPrefix(replace, `"`) && strings.HasSuffix(replace, `"`) {
-		replace = replace[1 : len(replace)-1]
+		flags = args[2]
 	}
 
-	// We replace all escaped double quotes to real double quotes
-	search = strings.Replace(search, `\"`, `"`, -1)
-	replace = strings.Replace(replace, `\"`, `"`, -1)
-	// Replace some things so users can actually insert newlines and tabs in replacements
-	replace = strings.Replace(replace, "\\n", "\n", -1)
-	replace = strings.Replace(replace, "\\t", "\t", -1)
+	search := string(args[0])
+	replace := string(args[1])
 
-	regex, err := regexp.Compile(search)
+	regex, err := regexp.Compile("(?m)" + search)
 	if err != nil {
 		// There was an error with the user's regex
 		messenger.Error(err.Error())
@@ -262,15 +432,13 @@ func Replace(args []string) {
 	view := CurView()
 
 	found := 0
-	for {
-		match := regex.FindStringIndex(view.Buf.String())
-		if match == nil {
-			break
-		}
-		found++
-		if strings.Contains(flags, "c") {
+	if strings.Contains(flags, "c") {
+		for {
 			// The 'check' flag was used
 			Search(search, view, true)
+			if !view.Cursor.HasSelection() {
+				break
+			}
 			view.Relocate()
 			if view.Buf.Settings["syntax"].(bool) {
 				view.matches = Match(view)
@@ -283,13 +451,14 @@ func Replace(args []string) {
 					view.Cursor.ResetSelection()
 				}
 				messenger.Reset()
-				return
+				break
 			}
 			if choice {
 				view.Cursor.DeleteSelection()
-				view.Buf.Insert(FromCharPos(match[0], view.Buf), replace)
+				view.Buf.Insert(view.Cursor.Loc, replace)
 				view.Cursor.ResetSelection()
 				messenger.Reset()
+				found++
 			} else {
 				if view.Cursor.HasSelection() {
 					searchStart = ToCharPos(view.Cursor.CurSelection[1], view.Buf)
@@ -298,16 +467,37 @@ func Replace(args []string) {
 				}
 				continue
 			}
-		} else {
-			view.Buf.Replace(FromCharPos(match[0], view.Buf), FromCharPos(match[1], view.Buf), replace)
+		}
+	} else {
+		bufStr := view.Buf.String()
+		matches := regex.FindAllStringIndex(bufStr, -1)
+		if matches != nil && len(matches) > 0 {
+			prevMatchCount := runePos(matches[0][0], bufStr)
+			searchCount := runePos(matches[0][1], bufStr) - prevMatchCount
+			from := FromCharPos(matches[0][0], view.Buf)
+			to := from.Move(searchCount, view.Buf)
+			adjust := Count(replace) - searchCount
+			view.Buf.Replace(from, to, replace)
+			if len(matches) > 1 {
+				for _, match := range matches[1:] {
+					found++
+					matchCount := runePos(match[0], bufStr)
+					searchCount = runePos(match[1], bufStr) - matchCount
+					from = from.Move(matchCount-prevMatchCount+adjust, view.Buf)
+					to = from.Move(searchCount, view.Buf)
+					view.Buf.Replace(from, to, replace)
+					prevMatchCount = matchCount
+					adjust = Count(replace) - searchCount
+				}
+			}
 		}
 	}
 	view.Cursor.Relocate()
 
 	if found > 1 {
-		messenger.Message("Replaced ", found, " occurences of ", search)
+		messenger.Message("Replaced ", found, " occurrences of ", search)
 	} else if found == 1 {
-		messenger.Message("Replaced ", found, " occurence of ", search)
+		messenger.Message("Replaced ", found, " occurrence of ", search)
 	} else {
 		messenger.Message("Nothing matched ", search)
 	}
@@ -315,8 +505,8 @@ func Replace(args []string) {
 
 // RunShellCommand executes a shell command and returns the output/error
 func RunShellCommand(input string) (string, error) {
-	inputCmd := strings.Split(input, " ")[0]
-	args := strings.Split(input, " ")[1:]
+	inputCmd := SplitCommandArgs(input)[0]
+	args := SplitCommandArgs(input)[1:]
 
 	cmd := exec.Command(inputCmd, args...)
 	outputBytes := &bytes.Buffer{}
@@ -331,8 +521,8 @@ func RunShellCommand(input string) (string, error) {
 // 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) {
-	inputCmd := strings.Split(input, " ")[0]
+func HandleShellCommand(input string, openTerm bool, waitToFinish bool) string {
+	inputCmd := SplitCommandArgs(input)[0]
 	if !openTerm {
 		// Simply run the command in the background and notify the user when it's done
 		messenger.Message("Running...")
@@ -357,12 +547,13 @@ func HandleShellCommand(input string, openTerm bool) {
 		screen.Fini()
 		screen = nil
 
-		args := strings.Split(input, " ")[1:]
+		args := SplitCommandArgs(input)[1:]
 
 		// Set up everything for the command
+		var outputBuf bytes.Buffer
 		cmd := exec.Command(inputCmd, args...)
 		cmd.Stdin = os.Stdin
-		cmd.Stdout = os.Stdout
+		cmd.Stdout = io.MultiWriter(os.Stdout, &outputBuf)
 		cmd.Stderr = os.Stderr
 
 		// This is a trap for Ctrl-C so that it doesn't kill micro
@@ -375,26 +566,35 @@ func HandleShellCommand(input string, openTerm bool) {
 			}
 		}()
 
-		// Start the command
 		cmd.Start()
-		cmd.Wait()
+		err := cmd.Wait()
 
-		// This is just so we don't return right away and let the user press enter to return
-		TermMessage("")
+		output := outputBuf.String()
+		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
 	}
+	return ""
 }
 
 // HandleCommand handles input from the user
 func HandleCommand(input string) {
-	inputCmd := strings.Split(input, " ")[0]
-	args := strings.Split(input, " ")[1:]
+	args := SplitCommandArgs(input)
+	inputCmd := args[0]
 
 	if _, ok := commands[inputCmd]; !ok {
-		messenger.Error("Unkown command ", inputCmd)
+		messenger.Error("Unknown command ", inputCmd)
 	} else {
-		commands[inputCmd].action(args)
+		commands[inputCmd].action(args[1:])
 	}
 }