Add cd and pwd commands to change the working dir

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

diff --git a/cmd/micro/plugin.go b/cmd/micro/plugin.go
index f2091bfcf58266eefdf58ff1b9daba4fcee9e052..d77baea9ba5fdf4e3c6eaecc757bfe553323aa4b 100644 (file)
--- a/cmd/micro/plugin.go
+++ b/cmd/micro/plugin.go
@@ -12,16 +12,10 @@ import (
 
 var loadedPlugins []string
 
-var preInstalledPlugins = []string{
-       "go",
-       "linter",
-       "autoclose",
-}
-
 // Call calls the lua function 'function'
 // If it does not exist nothing happens, if there is an error,
 // the error is returned
-func Call(function string, args []string) (lua.LValue, error) {
+func Call(function string, args ...interface{}) (lua.LValue, error) {
        var luaFunc lua.LValue
        if strings.Contains(function, ".") {
                plugin := L.GetGlobal(strings.Split(function, ".")[0])
@@ -66,20 +60,52 @@ func LuaFunctionBinding(function string) func(*View, bool) bool {
        }
 }
 
+func unpack(old []string) []interface{} {
+       new := make([]interface{}, len(old))
+       for i, v := range old {
+               new[i] = v
+       }
+       return new
+}
+
 // LuaFunctionCommand is the same as LuaFunctionBinding except it returns a normal function
 // so that a command can be bound to a lua function
 func LuaFunctionCommand(function string) func([]string) {
        return func(args []string) {
-               _, err := Call(function, args)
+               _, err := Call(function, unpack(args)...)
+               if err != nil {
+                       TermMessage(err)
+               }
+       }
+}
+
+// LuaFunctionComplete returns a function which can be used for autocomplete in plugins
+func LuaFunctionComplete(function string) func(string) []string {
+       return func(input string) (result []string) {
+
+               res, err := Call(function, input)
                if err != nil {
                        TermMessage(err)
                }
+               if tbl, ok := res.(*lua.LTable); !ok {
+                       TermMessage(function, "should return a table of strings")
+               } else {
+                       for i := 1; i <= tbl.Len(); i++ {
+                               val := tbl.RawGetInt(i)
+                               if v, ok := val.(lua.LString); !ok {
+                                       TermMessage(function, "should return a table of strings")
+                               } else {
+                                       result = append(result, string(v))
+                               }
+                       }
+               }
+               return result
        }
 }
 
 func LuaFunctionJob(function string) func(string, ...string) {
        return func(output string, args ...string) {
-               _, err := Call(function, append([]string{output}, args...))
+               _, err := Call(function, unpack(append([]string{output}, args...))...)
                if err != nil {
                        TermMessage(err)
                }
@@ -88,54 +114,38 @@ func LuaFunctionJob(function string) func(string, ...string) {
 
 // LoadPlugins loads the pre-installed plugins and the plugins located in ~/.config/micro/plugins
 func LoadPlugins() {
-       files, _ := ioutil.ReadDir(configDir + "/plugins")
-       for _, plugin := range files {
-               if plugin.IsDir() {
-                       pluginName := plugin.Name()
-                       files, _ := ioutil.ReadDir(configDir + "/plugins/" + pluginName)
-                       for _, f := range files {
-                               if f.Name() == pluginName+".lua" {
-                                       data, _ := ioutil.ReadFile(configDir + "/plugins/" + pluginName + "/" + f.Name())
-                                       pluginDef := "\nlocal P = {}\n" + pluginName + " = P\nsetmetatable(" + pluginName + ", {__index = _G})\nsetfenv(1, P)\n"
-
-                                       if err := L.DoString(pluginDef + string(data)); err != nil {
-                                               TermMessage(err)
-                                               continue
-                                       }
-                                       loadedPlugins = append(loadedPlugins, pluginName)
-                               }
-                       }
-               }
-       }
-
-       for _, pluginName := range preInstalledPlugins {
+       for _, plugin := range ListRuntimeFiles(RTPlugin) {
                alreadyExists := false
+               pluginName := plugin.Name()
                for _, pl := range loadedPlugins {
                        if pl == pluginName {
                                alreadyExists = true
                                break
                        }
                }
+
                if !alreadyExists {
-                       plugin := "runtime/plugins/" + pluginName + "/" + pluginName + ".lua"
-                       data, err := Asset(plugin)
+                       data, err := plugin.Data()
                        if err != nil {
-                               TermMessage("Error loading pre-installed plugin: " + pluginName)
+                               TermMessage("Error loading plugin: " + pluginName)
                                continue
                        }
                        pluginDef := "\nlocal P = {}\n" + pluginName + " = P\nsetmetatable(" + pluginName + ", {__index = _G})\nsetfenv(1, P)\n"
+
                        if err := L.DoString(pluginDef + string(data)); err != nil {
                                TermMessage(err)
                                continue
                        }
-
                        loadedPlugins = append(loadedPlugins, pluginName)
                }
        }
 
        if _, err := os.Stat(configDir + "/init.lua"); err == nil {
-               if err := L.DoFile(configDir + "/init.lua"); err != nil {
+               pluginDef := "\nlocal P = {}\n" + "init" + " = P\nsetmetatable(" + "init" + ", {__index = _G})\nsetfenv(1, P)\n"
+               data, _ := ioutil.ReadFile(configDir + "/init.lua")
+               if err := L.DoString(pluginDef + string(data)); err != nil {
                        TermMessage(err)
                }
+               loadedPlugins = append(loadedPlugins, "init")
        }
 }