X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fcommand.go;h=0c582e2025ce9d75f4867695dae651c741b3caaf;hb=37ae99ccd9b7b3a658a2e773af74ca08c88c0d07;hp=9282d7bd8bb92bb418024850a8a6369faf87fc0f;hpb=d3d35bd9ffa9ffadc7f48bd1909e58d4398f10b9;p=micro.git diff --git a/cmd/micro/command.go b/cmd/micro/command.go index 9282d7bd..0c582e20 100644 --- a/cmd/micro/command.go +++ b/cmd/micro/command.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "os/exec" "os/signal" + "path/filepath" "regexp" "strings" @@ -26,22 +26,30 @@ type StrCommand struct { var commands map[string]Command -var 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, +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, + "Open": Open, + } } // InitCommands initializes the default commands @@ -89,6 +97,10 @@ func DefaultCommands() map[string]StrCommand { "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}}, + "open": {"Open", []Completion{FileCompletion}}, } } @@ -97,6 +109,7 @@ 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 { @@ -104,19 +117,35 @@ func PluginCmd(args []string) { } 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": @@ -145,22 +174,78 @@ func PluginCmd(args []string) { 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 Open(args []string) { + if len(args) > 0 { + filename := args[0] + // the filename might or might not be quoted, so unquote first then join the strings. + filename = strings.Join(SplitCommandArgs(filename), " ") + + CurView().Open(filename) + } else { + messenger.Error("No filename") + } +} + 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 { @@ -180,17 +265,18 @@ func Help(args []string) { // If no file is given, it opens an empty buffer in a new split func VSplit(args []string) { if len(args) == 0 { - CurView().VSplit(NewBuffer([]byte{}, "")) + CurView().VSplit(NewBuffer(strings.NewReader(""), "")) } else { filename := args[0] home, _ := homedir.Dir() filename = strings.Replace(filename, "~", home, 1) - file, err := ioutil.ReadFile(filename) + file, err := os.Open(filename) + defer file.Close() var buf *Buffer if err != nil { // File does not exist -- create an empty buffer with that name - buf = NewBuffer([]byte{}, filename) + buf = NewBuffer(strings.NewReader(""), filename) } else { buf = NewBuffer(file, filename) } @@ -202,17 +288,18 @@ func VSplit(args []string) { // If no file is given, it opens an empty buffer in a new split func HSplit(args []string) { if len(args) == 0 { - CurView().HSplit(NewBuffer([]byte{}, "")) + CurView().HSplit(NewBuffer(strings.NewReader(""), "")) } else { filename := args[0] home, _ := homedir.Dir() filename = strings.Replace(filename, "~", home, 1) - file, err := ioutil.ReadFile(filename) + file, err := os.Open(filename) + defer file.Close() var buf *Buffer if err != nil { // File does not exist -- create an empty buffer with that name - buf = NewBuffer([]byte{}, filename) + buf = NewBuffer(strings.NewReader(""), filename) } else { buf = NewBuffer(file, filename) } @@ -240,12 +327,13 @@ func NewTab(args []string) { filename := args[0] home, _ := homedir.Dir() filename = strings.Replace(filename, "~", home, 1) - file, _ := ioutil.ReadFile(filename) + file, _ := os.Open(filename) + defer file.Close() tab := NewTabFromView(NewView(NewBuffer(file, filename))) tab.SetNum(len(tabs)) tabs = append(tabs, tab) - curTab++ + curTab = len(tabs) - 1 if len(tabs) == 2 { for _, t := range tabs { for _, v := range t.views { @@ -350,7 +438,7 @@ func Replace(args []string) { 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()) @@ -397,23 +485,25 @@ func Replace(args []string) { } } } else { - matches := regex.FindAllStringIndex(view.Buf.String(), -1) + bufStr := view.Buf.String() + matches := regex.FindAllStringIndex(bufStr, -1) if matches != nil && len(matches) > 0 { - adjust := 0 - prevMatch := matches[0] - from := FromCharPos(prevMatch[0], view.Buf) - to := from.Move(Count(search), view.Buf) - adjust += Count(replace) - Count(search) + 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++ - from = from.Move(match[0]-prevMatch[0]+adjust, view.Buf) - to := from.Move(Count(search), view.Buf) - // TermMessage(match[0], " ", prevMatch[0], " ", adjust, "\n", from, " ", to) + 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) - prevMatch = match - // adjust += Count(replace) - Count(search) + prevMatchCount = matchCount + adjust = Count(replace) - searchCount } } }