Add linter plugin support

This commit is contained in:
Zachary Yedidia
2019-08-02 23:46:25 -07:00
parent e7e0272968
commit 4027081e0e
11 changed files with 166 additions and 99 deletions

View File

@@ -1,6 +1,7 @@
package action
import (
"log"
"strings"
"time"
@@ -261,7 +262,8 @@ func (h *BufPane) DoKeyEvent(e Event) bool {
// canceled by plugin
continue
}
if action(h) && h.PluginCB("on"+estr) {
rel := action(h)
if h.PluginCB("on"+estr) && rel {
h.Relocate()
}
}
@@ -271,7 +273,9 @@ func (h *BufPane) DoKeyEvent(e Event) bool {
if !h.PluginCB("pre" + estr) {
return false
}
if action(h) && h.PluginCB("on"+estr) {
rel := action(h)
log.Println("calling on", estr)
if h.PluginCB("on"+estr) && rel {
h.Relocate()
}
return true

View File

@@ -367,8 +367,13 @@ func SetGlobalOptionNative(option string, nativeValue interface{}) error {
}
} else {
for _, pl := range config.Plugins {
if option == pl.Name && nativeValue.(bool) && !pl.Loaded {
pl.Load()
if option == pl.Name {
if nativeValue.(bool) && !pl.Loaded {
pl.Load()
pl.Call("init")
} else if !nativeValue.(bool) && pl.Loaded {
pl.Call("deinit")
}
}
}
}

View File

@@ -17,10 +17,10 @@ type Message struct {
Msg string
Start, End Loc
Kind MsgType
Owner int
Owner string
}
func NewMessage(owner int, msg string, start, end Loc, kind MsgType) *Message {
func NewMessage(owner string, msg string, start, end Loc, kind MsgType) *Message {
return &Message{
Msg: msg,
Start: start,
@@ -30,8 +30,8 @@ func NewMessage(owner int, msg string, start, end Loc, kind MsgType) *Message {
}
}
func NewMessageAtLine(owner int, msg string, line int, kind MsgType) *Message {
start := Loc{-1, line}
func NewMessageAtLine(owner string, msg string, line int, kind MsgType) *Message {
start := Loc{-1, line - 1}
end := start
return NewMessage(owner, msg, start, end, kind)
}
@@ -64,7 +64,7 @@ func (b *Buffer) removeMsg(i int) {
b.Messages = b.Messages[:len(b.Messages)-1]
}
func (b *Buffer) ClearMessages(owner int) {
func (b *Buffer) ClearMessages(owner string) {
for i := len(b.Messages) - 1; i >= 0; i-- {
if b.Messages[i].Owner == owner {
b.removeMsg(i)

View File

@@ -2,6 +2,7 @@ package config
import (
"errors"
"log"
lua "github.com/yuin/gopher-lua"
ulua "github.com/zyedidia/micro/internal/lua"
@@ -10,10 +11,15 @@ import (
var ErrNoSuchFunction = errors.New("No such function exists")
// LoadAllPlugins loads all detected plugins (in runtime/plugins and ConfigDir/plugins)
func LoadAllPlugins() {
func LoadAllPlugins() error {
var reterr error
for _, p := range Plugins {
p.Load()
err := p.Load()
if err != nil {
reterr = err
}
}
return reterr
}
// RunPluginFn runs a given function in all plugins
@@ -68,7 +74,7 @@ type Plugin struct {
func (p *Plugin) IsEnabled() bool {
if v, ok := GlobalSettings[p.Name]; ok {
return v.(bool)
return v.(bool) && p.Loaded
}
return true
}
@@ -77,7 +83,7 @@ var Plugins []*Plugin
func (p *Plugin) Load() error {
for _, f := range p.Srcs {
if !p.IsEnabled() {
if v, ok := GlobalSettings[p.Name]; ok && !v.(bool) {
return nil
}
dat, err := f.Data()
@@ -98,6 +104,7 @@ func (p *Plugin) Load() error {
func (p *Plugin) Call(fn string, args ...lua.LValue) (lua.LValue, error) {
plug := ulua.L.GetGlobal(p.Name)
log.Println(p.Name, fn, plug)
luafn := ulua.L.GetField(plug, fn)
if luafn == lua.LNil {
return nil, ErrNoSuchFunction

File diff suppressed because one or more lines are too long

View File

@@ -57,7 +57,7 @@ func Import(pkg string) *lua.LTable {
return importRuntime()
case "path":
return importPath()
case "filepath":
case "path/filepath", "filepath":
return importFilePath()
case "strings":
return importStrings()
@@ -67,7 +67,7 @@ func Import(pkg string) *lua.LTable {
return importErrors()
case "time":
return importTime()
case "utf8":
case "unicode/utf8", "utf8":
return importUtf8()
default:
return nil

View File

@@ -32,17 +32,17 @@ func init() {
// JobFunction is a representation of a job (this data structure is what is loaded
// into the jobs channel)
type JobFunction struct {
Function func(string, ...string)
Function func(string, ...interface{})
Output string
Args []string
Args []interface{}
}
// A CallbackFile is the data structure that makes it possible to catch stderr and stdout write events
type CallbackFile struct {
io.Writer
callback func(string, ...string)
args []string
callback func(string, ...interface{})
args []interface{}
}
func (f *CallbackFile) Write(data []byte) (int, error) {
@@ -55,13 +55,13 @@ func (f *CallbackFile) Write(data []byte) (int, error) {
// JobStart starts a shell command in the background with the given callbacks
// It returns an *exec.Cmd as the job id
func JobStart(cmd string, onStdout, onStderr, onExit string, userargs ...string) *exec.Cmd {
func JobStart(cmd string, onStdout, onStderr, onExit string, userargs ...interface{}) *exec.Cmd {
return JobSpawn("sh", []string{"-c", cmd}, onStdout, onStderr, onExit, userargs...)
}
// JobSpawn starts a process with args in the background with the given callbacks
// It returns an *exec.Cmd as the job id
func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit string, userargs ...string) *exec.Cmd {
func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit string, userargs ...interface{}) *exec.Cmd {
// Set up everything correctly if the functions have been provided
proc := exec.Command(cmdName, cmdArgs...)
var outbuf bytes.Buffer
@@ -104,12 +104,13 @@ func JobSend(cmd *exec.Cmd, data string) {
// luaFunctionJob returns a function that will call the given lua function
// structured as a job call i.e. the job output and arguments are provided
// to the lua function
func luaFunctionJob(fn string) func(string, ...string) {
func luaFunctionJob(fn string) func(string, ...interface{}) {
luaFn := strings.Split(fn, ".")
plName, plFn := luaFn[0], luaFn[1]
pl := config.FindPlugin(plName)
return func(output string, args ...string) {
return func(output string, args ...interface{}) {
var luaArgs []lua.LValue
luaArgs = append(luaArgs, luar.New(ulua.L, output))
for _, v := range args {
luaArgs = append(luaArgs, luar.New(ulua.L, v))
}
@@ -119,11 +120,3 @@ func luaFunctionJob(fn string) func(string, ...string) {
}
}
}
func unpack(old []string) []interface{} {
new := make([]interface{}, len(old))
for i, v := range old {
new[i] = v
}
return new
}

View File

@@ -3,6 +3,7 @@ package util
import (
"errors"
"fmt"
"log"
"os"
"os/user"
"path/filepath"
@@ -202,10 +203,10 @@ func FSize(f *os.File) int64 {
}
// IsWordChar returns whether or not the string is a 'word character'
// If it is a unicode character, then it does not match
// Word characters are defined as [A-Za-z0-9_]
// Word characters are defined as numbers, letters, or '_'
func IsWordChar(r rune) bool {
return (r >= '0' && r <= '9') || (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') || (r == '_')
log.Println("IsWordChar")
return unicode.IsLetter(r) || unicode.IsNumber(r) || r == '_'
}
// Spaces returns a string with n spaces
@@ -237,7 +238,7 @@ func IsSpacesOrTabs(str []byte) bool {
// IsWhitespace returns true if the given rune is a space, tab, or newline
func IsWhitespace(c rune) bool {
return c == ' ' || c == '\t' || c == '\n'
return unicode.IsSpace(c)
}
// IsBytesWhitespace returns true if the given bytes are all whitespace