Go plugin should disable tabstospaces if the file is go

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

diff --git a/cmd/micro/command.go b/cmd/micro/command.go
index 0a16815b36e832355d414b6a7a0335733379a385..b41a3db4748920cbaacf7902524817d3c6c585e8 100644 (file)
--- a/cmd/micro/command.go
+++ b/cmd/micro/command.go
@@ -12,7 +12,17 @@ import (
        "github.com/mitchellh/go-homedir"
 )
 
-var commands map[string]func([]string)
+type Command struct {
+       action      func([]string)
+       completions []Completion
+}
+
+type StrCommand struct {
+       action      string
+       completions []Completion
+}
+
+var commands map[string]Command
 
 var commandActions = map[string]func([]string){
        "Set":     Set,
@@ -29,21 +39,21 @@ var commandActions = map[string]func([]string){
 
 // InitCommands initializes the default commands
 func InitCommands() {
-       commands = make(map[string]func([]string))
+       commands = make(map[string]Command)
 
        defaults := DefaultCommands()
        parseCommands(defaults)
 }
 
-func parseCommands(userCommands map[string]string) {
+func parseCommands(userCommands map[string]StrCommand) {
        for k, v := range userCommands {
-               MakeCommand(k, v)
+               MakeCommand(k, v.action, v.completions...)
        }
 }
 
 // MakeCommand is a function to easily create new commands
 // This can be called by plugins in Lua so that plugins can define their own commands
-func MakeCommand(name, function string) {
+func MakeCommand(name, function string, completions ...Completion) {
        action := commandActions[function]
        if _, ok := commandActions[function]; !ok {
                // If the user seems to be binding a function that doesn't exist
@@ -51,22 +61,22 @@ func MakeCommand(name, function string) {
                action = LuaFunctionCommand(function)
        }
 
-       commands[name] = action
+       commands[name] = Command{action, completions}
 }
 
 // DefaultCommands returns a map containing micro's default commands
-func DefaultCommands() map[string]string {
-       return map[string]string{
-               "set":     "Set",
-               "bind":    "Bind",
-               "run":     "Run",
-               "quit":    "Quit",
-               "save":    "Save",
-               "replace": "Replace",
-               "vsplit":  "VSplit",
-               "hsplit":  "HSplit",
-               "tab":     "Tab",
-               "help":    "Help",
+func DefaultCommands() map[string]StrCommand {
+       return map[string]StrCommand{
+               "set":     StrCommand{"Set", []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}},
        }
 }
 
@@ -129,10 +139,10 @@ func HSplit(args []string) {
        }
 }
 
-// Tab opens the given file in a new tab
+// NewTab opens the given file in a new tab
 func NewTab(args []string) {
        if len(args) == 0 {
-               CurView().AddTab()
+               CurView().AddTab(true)
        } else {
                filename := args[0]
                home, _ := homedir.Dir()
@@ -155,12 +165,14 @@ func NewTab(args []string) {
 
 // Set sets an option
 func Set(args []string) {
-       // Set an option and we have to set it for every view
-       for _, tab := range tabs {
-               for _, view := range tab.views {
-                       SetOption(view, args)
-               }
+       if len(args) < 2 {
+               return
        }
+
+       option := strings.TrimSpace(args[0])
+       value := strings.TrimSpace(args[1])
+
+       SetOptionAndSettings(option, value)
 }
 
 // Bind creates a new keybinding
@@ -181,13 +193,13 @@ func Run(args []string) {
 // Quit closes the main view
 func Quit(args []string) {
        // Close the main view
-       CurView().Quit()
+       CurView().Quit(true)
 }
 
 // Save saves the buffer in the main view
 func Save(args []string) {
        // Save the main view
-       CurView().Save()
+       CurView().Save(true)
 }
 
 // Replace runs search and replace
@@ -370,6 +382,6 @@ func HandleCommand(input string) {
        if _, ok := commands[inputCmd]; !ok {
                messenger.Error("Unkown command ", inputCmd)
        } else {
-               commands[inputCmd](args)
+               commands[inputCmd].action(args)
        }
 }