Small fix to redraw location

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

diff --git a/cmd/micro/plugin.go b/cmd/micro/plugin.go
index d60f9510db5b0e10a6cadf5f5fa74a52cddc1b76..f2091bfcf58266eefdf58ff1b9daba4fcee9e052 100644 (file)
--- a/cmd/micro/plugin.go
+++ b/cmd/micro/plugin.go
@@ -3,6 +3,7 @@ package main
 import (
        "errors"
        "io/ioutil"
+       "os"
        "strings"
 
        "github.com/layeh/gopher-luar"
@@ -14,17 +15,18 @@ 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) error {
+func Call(function string, args []string) (lua.LValue, error) {
        var luaFunc lua.LValue
        if strings.Contains(function, ".") {
                plugin := L.GetGlobal(strings.Split(function, ".")[0])
                if plugin.String() == "nil" {
-                       return errors.New("function does not exist: " + function)
+                       return nil, errors.New("function does not exist: " + function)
                }
                luaFunc = L.GetField(plugin, strings.Split(function, ".")[1])
        } else {
@@ -32,7 +34,7 @@ func Call(function string, args []string) error {
        }
 
        if luaFunc.String() == "nil" {
-               return errors.New("function does not exist: " + function)
+               return nil, errors.New("function does not exist: " + function)
        }
        var luaArgs []lua.LValue
        for _, v := range args {
@@ -40,19 +42,23 @@ func Call(function string, args []string) error {
        }
        err := L.CallByParam(lua.P{
                Fn:      luaFunc,
-               NRet:    0,
+               NRet:    1,
                Protect: true,
        }, luaArgs...)
-       return err
+       ret := L.Get(-1) // returned value
+       if ret.String() != "nil" {
+               L.Pop(1) // remove received value
+       }
+       return ret, err
 }
 
 // LuaFunctionBinding is a function generator which takes the name of a lua function
 // and creates a function that will call that lua function
 // Specifically it creates a function that can be called as a binding because this is used
 // to bind keys to lua functions
-func LuaFunctionBinding(function string) func(*View) bool {
-       return func(v *View) bool {
-               err := Call(function, nil)
+func LuaFunctionBinding(function string) func(*View, bool) bool {
+       return func(v *View, _ bool) bool {
+               _, err := Call(function, nil)
                if err != nil {
                        TermMessage(err)
                }
@@ -64,7 +70,7 @@ func LuaFunctionBinding(function string) func(*View) bool {
 // 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, args)
                if err != nil {
                        TermMessage(err)
                }
@@ -73,7 +79,7 @@ func LuaFunctionCommand(function string) func([]string) {
 
 func LuaFunctionJob(function string) func(string, ...string) {
        return func(output string, args ...string) {
-               err := Call(function, append([]string{output}, args...))
+               _, err := Call(function, append([]string{output}, args...))
                if err != nil {
                        TermMessage(err)
                }
@@ -103,17 +109,33 @@ func LoadPlugins() {
        }
 
        for _, pluginName := range preInstalledPlugins {
-               plugin := "runtime/plugins/" + pluginName + "/" + pluginName + ".lua"
-               data, err := Asset(plugin)
-               if err != nil {
-                       TermMessage("Error loading pre-installed plugin: " + pluginName)
-                       continue
+               alreadyExists := false
+               for _, pl := range loadedPlugins {
+                       if pl == pluginName {
+                               alreadyExists = true
+                               break
+                       }
                }
-               pluginDef := "\nlocal P = {}\n" + pluginName + " = P\nsetmetatable(" + pluginName + ", {__index = _G})\nsetfenv(1, P)\n"
-               if err := L.DoString(pluginDef + string(data)); err != nil {
+               if !alreadyExists {
+                       plugin := "runtime/plugins/" + pluginName + "/" + pluginName + ".lua"
+                       data, err := Asset(plugin)
+                       if err != nil {
+                               TermMessage("Error loading pre-installed 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 {
                        TermMessage(err)
-                       continue
                }
-               loadedPlugins = append(loadedPlugins, pluginName)
        }
 }